[banshee] Restart songs using multimedia keys (bgo#607067)
- From: Alexander Kojevnikov <alexk src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [banshee] Restart songs using multimedia keys (bgo#607067)
- Date: Mon, 18 Jan 2010 05:03:13 +0000 (UTC)
commit e9f0c5aea9eb24fb409f478106def3518c7ed7a0
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date: Mon Jan 18 15:59:11 2010 +1100
Restart songs using multimedia keys (bgo#607067)
When pressing the "Previous" button in the UI we restart the playing song
if its position is more than 4 seconds. Use the same logic when "Previous"
button is pressed on the multimedia keyboard.
.../PlaybackControllerService.cs | 14 ++++++++++++++
.../Banshee.Gui/PlaybackActions.cs | 7 +------
.../MultimediaKeysService.cs | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
index 6625cde..c224ce3 100644
--- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
@@ -253,6 +253,20 @@ namespace Banshee.PlaybackController
OnTransition ();
}
+ public void RestartOrPrevious ()
+ {
+ const int delay = 4000; // ms
+ if (player_engine.Position < delay) {
+ Previous ();
+ } else {
+ var track = player_engine.CurrentTrack;
+ if (track != null) {
+ player_engine.Close ();
+ player_engine.OpenPlay (track);
+ }
+ }
+ }
+
bool IBasicPlaybackController.First ()
{
if (Source.Count > 0) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
index 4efe0d9..e7c04b1 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
@@ -215,12 +215,7 @@ namespace Banshee.Gui
private void OnPreviousAction (object o, EventArgs args)
{
- const int delay = 4000; // ms
- if (ServiceManager.PlayerEngine.Position < delay) {
- ServiceManager.PlaybackController.Previous ();
- } else {
- OnRestartSongAction (o, args);
- }
+ ServiceManager.PlaybackController.RestartOrPrevious ();
}
private void OnSeekToAction (object o, EventArgs args)
diff --git a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
index 555c63e..b11d190 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
+++ b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
@@ -148,7 +148,7 @@ namespace Banshee.MultimediaKeys
ServiceManager.PlaybackController.Next ();
break;
case "Previous":
- ServiceManager.PlaybackController.Previous ();
+ ServiceManager.PlaybackController.RestartOrPrevious ();
break;
case "Stop":
ServiceManager.PlayerEngine.Close ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]