totem r5455 - in trunk: . browser-plugin

[hadess svn gnome org]

Author: hadess
Date: Mon Jun  9 14:31:14 2008
New Revision: 5455
URL: http://svn.gnome.org/viewvc/totem?rev=5455&view=rev

Log:
2008-06-09  Bastien Nocera  <hadess hadess net>

	* browser-plugin/totemConePlaylist.cpp: Implement Playlist::isplaying,
	(Closes: #526737)
	* browser-plugin/totemNarrowSpacePlugin.cpp: Fix GetPluginStatus()
	to return the status in the same form QT callers are expecting



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totemConePlaylist.cpp
   trunk/browser-plugin/totemNarrowSpacePlugin.cpp

Modified: trunk/browser-plugin/totemConePlaylist.cpp
==============================================================================
--- trunk/browser-plugin/totemConePlaylist.cpp	(original)
+++ trunk/browser-plugin/totemConePlaylist.cpp	Mon Jun  9 14:31:14 2008
@@ -114,8 +114,7 @@
       return ObjectVariant (_result, Plugin()->GetNPObject (totemPlugin::eConePlaylistItems));
 
     case eIsPlaying:
-      TOTEM_WARN_GETTER_UNIMPLEMENTED (aIndex, _result);
-      return BoolVariant (_result, true);
+      return BoolVariant (_result, Plugin()->State() == TOTEM_STATE_PLAYING);
   }
 
   return false;

Modified: trunk/browser-plugin/totemNarrowSpacePlugin.cpp
==============================================================================
--- trunk/browser-plugin/totemNarrowSpacePlugin.cpp	(original)
+++ trunk/browser-plugin/totemNarrowSpacePlugin.cpp	Mon Jun  9 14:31:14 2008
@@ -395,8 +395,6 @@
     }
 
     case eGetPluginStatus: {
-      return true;
-#if 0
       /* ACString GetPluginStatus (); */
       static const char *kState[] = {
         "Complete",
@@ -406,11 +404,10 @@
         "Waiting"
       };
 
-      if (Plugin()->State() == eState_Error)
+      if (mPluginState == eState_Error)
         return StringVariant (_result, "Error:<1>");
 
-      return StringVariant (_result, kState[Plugin()->State()]);
-#endif
+      return StringVariant (_result, kState[mPluginState]);
     }
 
     case eGetTrackCount: