QML: added argument to stateChanged signal

JS: added argument to MediaPlayerStateChanged event fix #113
RSATom · Apr 28, 2015 · 1d145a0 · 1d145a0
1 parent 7c03266
commit 1d145a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/deps/QmlVlc b/deps/QmlVlc
diff --git a/src/Chimera.cpp b/src/Chimera.cpp
@@ -59,6 +59,8 @@ void Chimera::media_player_event( const libvlc_event_t* e )
 
     void (JSRootAPI::*event_to_fire)(void) = 0;
     bool fireStateChanged = false;
+    libvlc_state_t newState;
+
     bool scheduleNotPlaying = false;
 
     switch ( e->type ) {
@@ -68,17 +70,20 @@ void Chimera::media_player_event( const libvlc_event_t* e )
     case libvlc_MediaPlayerNothingSpecial:
         event_to_fire = &JSRootAPI::fire_MediaPlayerNothingSpecial;
         fireStateChanged = true;
+        newState = libvlc_NothingSpecial;
         break;
     case libvlc_MediaPlayerOpening:
         event_to_fire = &JSRootAPI::fire_MediaPlayerOpening;
         fireStateChanged = true;
+        newState = libvlc_Opening;
         break;
     case libvlc_MediaPlayerBuffering:
         h->ScheduleOnMainThread( api,
                                  boost::bind( &JSRootAPI::fire_MediaPlayerBuffering,
                                               api.get(),
                                               e->u.media_player_buffering.new_cache ) );
         fireStateChanged = true;
+        newState = libvlc_Buffering;
         break;
     case libvlc_MediaPlayerPlaying: {
         boost::shared_ptr<Chimera> thisPtr = FB::ptr_cast<Chimera>( shared_from_this() );
@@ -88,17 +93,20 @@ void Chimera::media_player_event( const libvlc_event_t* e )
 
         event_to_fire = &JSRootAPI::fire_MediaPlayerPlaying;
         fireStateChanged = true;
+        newState = libvlc_Playing;
         break;
     }
     case libvlc_MediaPlayerPaused:
         event_to_fire = &JSRootAPI::fire_MediaPlayerPaused;
         scheduleNotPlaying = true;
         fireStateChanged = true;
+        newState = libvlc_Paused;
         break;
     case libvlc_MediaPlayerStopped:
         event_to_fire = &JSRootAPI::fire_MediaPlayerStopped;
         scheduleNotPlaying = true;
         fireStateChanged = true;
+        newState = libvlc_Stopped;
         break;
     case libvlc_MediaPlayerForward:
         event_to_fire = &JSRootAPI::fire_MediaPlayerForward;
@@ -110,11 +118,13 @@ void Chimera::media_player_event( const libvlc_event_t* e )
         event_to_fire = &JSRootAPI::fire_MediaPlayerEndReached;
         scheduleNotPlaying = true;
         fireStateChanged = true;
+        newState = libvlc_Ended;
         break;
     case libvlc_MediaPlayerEncounteredError:
         event_to_fire = &JSRootAPI::fire_MediaPlayerEncounteredError;
         scheduleNotPlaying = true;
         fireStateChanged = true;
+        newState = libvlc_Error;
         break;
     case libvlc_MediaPlayerTimeChanged: {
         double new_time = static_cast<double>( e->u.media_player_time_changed.new_time );
@@ -168,7 +178,10 @@ void Chimera::media_player_event( const libvlc_event_t* e )
     }
 
     if( fireStateChanged ) {
-        h->ScheduleOnMainThread( api, boost::bind( &JSRootAPI::fire_MediaPlayerStateChanged, api.get() ) );
+        h->ScheduleOnMainThread( api,
+                                 boost::bind( &JSRootAPI::fire_MediaPlayerStateChanged,
+                                              api.get(),
+                                              newState ) );
     }
 
     if( scheduleNotPlaying ) {

diff --git a/src/ChimeraAPI.h b/src/ChimeraAPI.h
@@ -954,7 +954,7 @@ class JSRootAPI : public FB::JSAPIAuto
     FB_JSAPI_EVENT( MediaPlayerPausableChanged, 1, ( bool ) );
     FB_JSAPI_EVENT( MediaPlayerLengthChanged, 1, ( double ) );
 
-    FB_JSAPI_EVENT( MediaPlayerStateChanged, 0, () );
+    FB_JSAPI_EVENT( MediaPlayerStateChanged, 1, ( unsigned ) );
 
 private:
     ChimeraWeakPtr m_plugin;