playlist: remove activity callback in favor of input-current

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 2570ff191447cfd6e1cc0d4e0cff466f8883d86f..62ec1705e78bf9e1b8f42e45ac2d697c63d618d3 100644 (file)
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -236,7 +236,7 @@ static int Open( vlc_object_t *p_this )
     p_playlist = pl_Get( p_intf );
     p_sys->p_playlist = p_playlist;
 
-    var_AddCallback( p_playlist, "activity", AllCallback, p_intf );
+    var_AddCallback( p_playlist, "input-current", AllCallback, p_intf );
     var_AddCallback( p_playlist, "intf-change", AllCallback, p_intf );
     var_AddCallback( p_playlist, "volume", AllCallback, p_intf );
     var_AddCallback( p_playlist, "mute", AllCallback, p_intf );
@@ -298,7 +298,7 @@ static void Close   ( vlc_object_t *p_this )
     vlc_cancel( p_sys->thread );
     vlc_join( p_sys->thread, NULL );
 
-    var_DelCallback( p_playlist, "activity", AllCallback, p_intf );
+    var_DelCallback( p_playlist, "input-current", AllCallback, p_intf );
     var_DelCallback( p_playlist, "intf-change", AllCallback, p_intf );
     var_DelCallback( p_playlist, "volume", AllCallback, p_intf );
     var_DelCallback( p_playlist, "mute", AllCallback, p_intf );
@@ -981,7 +981,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
     callback_info_t info = { .signal = SIGNAL_NONE };
 
     // Wich event is it ?
-    if( !strcmp( "activity", psz_var ) )
+    if( !strcmp( "input-current", psz_var ) )
         info.signal = SIGNAL_ITEM_CURRENT;
     else if( !strcmp( "volume", psz_var ) )
     {
@@ -1036,7 +1036,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
 }
 
 /*****************************************************************************
- * TrackChange: callback on playlist "activity"
+ * TrackChange: callback on playlist "input-current"
  *****************************************************************************/
 static int TrackChange( intf_thread_t *p_intf )
 {

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 8682361827a708f71fd5997b0e49ac6698db38a7..db4e72149fe4e2158aeb887a77679b2241044884 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -688,7 +688,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     var_AddCallback(p_intf->p_libvlc, "intf-show", ShowController, self);
     var_AddCallback(p_intf->p_libvlc, "intf-boss", BossCallback, self);
     var_AddCallback(p_playlist, "item-change", PLItemUpdated, self);
-    var_AddCallback(p_playlist, "activity", PLItemChanged, self);
+    var_AddCallback(p_playlist, "input-current", PLItemChanged, self);
     var_AddCallback(p_playlist, "playlist-item-append", PLItemAppended, self);
     var_AddCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self);
     var_AddCallback(p_playlist, "random", PlaybackModeUpdated, self);
@@ -861,7 +861,7 @@ static bool f_appExit = false;
     var_DelCallback(p_intf, "dialog-question", DialogCallback, self);
     var_DelCallback(p_intf, "dialog-progress-bar", DialogCallback, self);
     var_DelCallback(p_playlist, "item-change", PLItemUpdated, self);
-    var_DelCallback(p_playlist, "activity", PLItemChanged, self);
+    var_DelCallback(p_playlist, "input-current", PLItemChanged, self);
     var_DelCallback(p_playlist, "playlist-item-append", PLItemAppended, self);
     var_DelCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self);
     var_DelCallback(p_playlist, "random", PlaybackModeUpdated, self);

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 749be0fab4a6eaf548a6b458659834b9ffd9c21a..d9b01993ea326d5793fe70263da4d6c9e22d0f89 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1020,7 +1020,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
 
     /* Core Callbacks */
     var_AddCallback( THEPL, "item-change", ItemChanged, im );
-    var_AddCallback( THEPL, "activity", PLItemChanged, this );
+    var_AddCallback( THEPL, "input-current", PLItemChanged, this );
     var_AddCallback( THEPL, "leaf-to-parent", LeafToParent, this );
     var_AddCallback( THEPL, "playlist-item-append", PLItemAppended, this );
     var_AddCallback( THEPL, "playlist-item-deleted", PLItemRemoved, this );
@@ -1046,7 +1046,7 @@ MainInputManager::~MainInputManager()
        emit inputChanged( NULL );
     }
 
-    var_DelCallback( THEPL, "activity", PLItemChanged, this );
+    var_DelCallback( THEPL, "input-current", PLItemChanged, this );
     var_DelCallback( THEPL, "item-change", ItemChanged, im );
     var_DelCallback( THEPL, "leaf-to-parent", LeafToParent, this );
 

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 05ea3b11745ae36104250c64d71b05070f237217..c34be2d0abfbca678fe7a4c77b66cc18360e7f17 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -451,8 +451,6 @@ static void VariablesInit( playlist_t *p_playlist )
 
     var_Create( p_playlist, "input-current", VLC_VAR_ADDRESS );
 
-    var_Create( p_playlist, "activity", VLC_VAR_VOID );
-
     /* Variables to control playback */
     var_Create( p_playlist, "playlist-autostart", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 95d734ef9d157f371a6d897cd0d6402ab9658406..178c5ccd179baa35afbcd5ade62f81f6ce8e62de 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -237,7 +237,6 @@ static bool PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     p_sys->p_input = p_input_thread;
     PL_UNLOCK;
 
-    var_TriggerCallback( p_playlist, "activity" );
     var_SetAddress( p_playlist, "input-current", p_input_thread );
 
     PL_LOCK;
@@ -460,7 +459,6 @@ static void LoopInput( playlist_t *p_playlist )
         var_DelCallback( p_input, "intf-event", InputEvent, p_playlist );
 
         input_Close( p_input );
-        var_TriggerCallback( p_playlist, "activity" );
         PL_LOCK;
         return;
     }