banshee r4096 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.MediaEngine

[abock svn gnome org]

Author: abock
Date: Tue Jun  3 22:40:44 2008
New Revision: 4096
URL: http://svn.gnome.org/viewvc/banshee?rev=4096&view=rev

Log:
2008-06-03  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:
    In Play (), always call OnPlayWhenIdleRequest if we are in the idle state,
    otherwise call Play on the base engine (BGO #534472)

    * src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:
    Also add mpga to the white list



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs	Tue Jun  3 22:40:44 2008
@@ -59,12 +59,12 @@
             "m1v",  "m21",  "m2p",  "m2v",  "m4a",  "m4b",  "m4e",  "m4p",  
             "m4u",  "m4v",  "mp+",  "mid",  "midi", "mjp",  "mkv",  "moov",
             "mov",  "movie","mp1",  "mp2",  "mp21", "mp3",  "mp4",  "mpa",
-            "mpc",  "mpe",  "mpeg", "mpg",  "mpp",  "mpu",  "mpv",  "mpv2",
-            "oga",  "ogg",  "ogv",  "ogm",  "omf",  "qt",   "ra",   "ram",  
-            "raw",  "rm",   "rmvb", "rts",  "smil", "swf",  "tivo", "u",
-            "vfw",  "vob",  "wav",  "wave", "wax",  "wm",   "wma",  "wmd",  
-            "wmv",  "wmx",  "wv",   "wvc",  "wvx",  "yuv",  "f4v",  "f4a",  
-            "f4b"
+            "mpc",  "mpe",  "mpeg", "mpg",  "mpga", "mpp",  "mpu",  "mpv",  
+            "mpv2", "oga",  "ogg",  "ogv",  "ogm",  "omf",  "qt",   "ra",
+            "ram",  "raw",  "rm",   "rmvb", "rts",  "smil", "swf",  "tivo", 
+            "u",    "vfw",  "vob",  "wav",  "wave", "wax",  "wm",   "wma",  
+            "wmd",  "wmv",  "wmx",  "wv",   "wvc",  "wvx",  "yuv",  "f4v",  
+            "f4a",  "f4b"
         };
 
         static DatabaseImportManager ()

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	Tue Jun  3 22:40:44 2008
@@ -372,7 +372,11 @@
         
         public void Play ()
         {
-            active_engine.Play ();
+            if (CurrentState == PlayerState.Idle) {
+                OnPlayWhenIdleRequest ();
+            } else {
+                active_engine.Play ();
+            }
         }
         
         public void Pause ()
@@ -386,16 +390,10 @@
         
         public void TogglePlaying ()
         {
-            switch (CurrentState) {
-                case PlayerState.Idle:
-                    OnPlayWhenIdleRequest ();
-                    break;
-                case PlayerState.Playing:
-                    Pause ();
-                    break;
-                default:
-                    Play ();
-                    break;
+            if (CurrentState == PlayerState.Playing) {
+                Pause ();
+            } else {
+                Play ();
             }
         }