Renamed playlist "playlist-current" to "item-current".

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index dd164865c6a7714b148b06b55b032d29f4dbac16..dd56d01928d30ca88d3f5fbec7a534610626567b 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -116,13 +116,15 @@ TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t);
  *
  *
  * The playlist defines the following event variables:
+ *
  * - "item-change": It will contains the input_item_t->i_id of a changed input
  * item monitored by the playlist.
+ * * - "item-current": It will contains a input_item_t->i_id of the current
+ * item being played.
+ *
+ * - "item-append": It will contains a pointer to a playlist_add_t.
  * - "item-deleted": It will contains the playlist_item_t->i_id of a deleted
  * playlist_item_t.
- * - "item-append": It will contains a pointer to a playlist_add_t.
- * - "playlist-current": It will contains a input_item_t->i_id of the current
- * item being played.
  *
  * XXX Be really carefull, playlist_item_t->i_id and input_item_t->i_id are not
  * the same. Yes, the situation is pretty bad.

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 1cf6b1840bbbe893d041519df9f8dd956f1bd8e5..5897acfad7688987fcf6ac5d3e211e1c9d14e74b 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -757,7 +757,7 @@ static int Open( vlc_object_t *p_this )
 
     p_playlist = pl_Hold( p_intf );
     PL_LOCK;
-    var_AddCallback( p_playlist, "playlist-current", TrackChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", TrackChange, p_intf );
     var_AddCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
     var_AddCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf );
     var_AddCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf );
@@ -786,7 +786,7 @@ static void Close   ( vlc_object_t *p_this )
     playlist_t      *p_playlist = pl_Hold( p_intf );;
     input_thread_t  *p_input;
 
-    var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf );
+    var_DelCallback( p_playlist, "item-current", TrackChange, p_intf );
     var_DelCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
     var_DelCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf );
     var_DelCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf );
@@ -966,7 +966,7 @@ static int StatusChangeEmit( vlc_object_t *p_this, const char *psz_var,
 }
 
 /*****************************************************************************
- * TrackChange: callback on playlist "playlist-current"
+ * TrackChange: callback on playlist "item-current"
  *****************************************************************************/
 static int TrackChange( vlc_object_t *p_this, const char *psz_var,
             vlc_value_t oldval, vlc_value_t newval, void *p_data )

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 5fe92d4f648ee47b58edd35f9809bb0358bf5441..cddbc546bb2dc097fb73449571248d2764f13f29 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -209,7 +209,7 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
     var_AddCallback( p_playlist, "item-change", PlaylistChanged, this );
     var_AddCallback( p_playlist, "item-append", PlaylistChanged, this );
     var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, this );
-    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, this );
+    var_AddCallback( p_playlist, "item-current", PlaylistChanged, this );
 
     char psz_tmp[1024];
 #define ADD_ELLIPSIS( a ) \

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 5619aa2c36ffee55208008b4e874503ed04ff2d7..0df3b5a952262d1f5e463954ced9a0e9db5c8523 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1410,7 +1410,7 @@ static void * manage_cleanup( void * args )
     id self = manage_cleanup_stack->self;
     playlist_t * p_playlist = manage_cleanup_stack->p_playlist;
 
-    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "item-current", PlaylistChanged, self );
     var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
     var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
     var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
@@ -1433,7 +1433,7 @@ static void * manage_cleanup( void * args )
 
     p_playlist = pl_Hold( p_intf );
 
-    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "item-current", PlaylistChanged, self );
     var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
     var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
     var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );

diff --git a/modules/gui/maemo/maemo.c b/modules/gui/maemo/maemo.c
index 82c6a1d8d406b23c2e360b6c451bcc94f9a76972..96e6080be03ad25bd05e8bd93c19f315aedb6dcd 100644 (file)
--- a/modules/gui/maemo/maemo.c
+++ b/modules/gui/maemo/maemo.c
@@ -228,7 +228,7 @@ static void Run( intf_thread_t *p_intf )
     g_timeout_add( 150 /* miliseconds */, should_die, p_intf );
     var_AddCallback( p_intf->p_sys->p_playlist, "item-change",
                      item_changed_cb, p_intf );
-    var_AddCallback( p_intf->p_sys->p_playlist, "playlist-current",
+    var_AddCallback( p_intf->p_sys->p_playlist, "item-current",
                      playlist_current_cb, p_intf );
     var_AddCallback( p_intf->p_sys->p_playlist, "activity",
                      activity_cb, p_intf );
@@ -244,7 +244,7 @@ static void Run( intf_thread_t *p_intf )
     delete_input( p_intf );
     var_DelCallback( p_intf->p_sys->p_playlist, "item-change",
                      item_changed_cb, p_intf );
-    var_DelCallback( p_intf->p_sys->p_playlist, "playlist-current",
+    var_DelCallback( p_intf->p_sys->p_playlist, "item-current",
                      playlist_current_cb, p_intf );
     var_DelCallback( p_intf->p_sys->p_playlist, "activity",
                      activity_cb, p_intf );

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 4cb8c2cabedebbe7917b49fcb00061d57e69dc7a..bbdb77a138c3089abe2f62285014760ba4de3e9d 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -221,7 +221,7 @@ void PLModel::addCallbacks()
     /* Some global changes happened -> Rebuild all */
     var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
     /* We went to the next item */
-    var_AddCallback( p_playlist, "playlist-current", PlaylistNext, this );
+    var_AddCallback( p_playlist, "item-current", PlaylistNext, this );
     /* One item has been updated */
     var_AddCallback( p_playlist, "item-change", ItemChanged, this );
     var_AddCallback( p_playlist, "item-append", ItemAppended, this );
@@ -231,7 +231,7 @@ void PLModel::addCallbacks()
 void PLModel::delCallbacks()
 {
     var_DelCallback( p_playlist, "item-change", ItemChanged, this );
-    var_DelCallback( p_playlist, "playlist-current", PlaylistNext, this );
+    var_DelCallback( p_playlist, "item-current", PlaylistNext, this );
     var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
     var_DelCallback( p_playlist, "item-append", ItemAppended, this );
     var_DelCallback( p_playlist, "item-deleted", ItemDeleted, this );

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index ff50671a184d54bfd570f16f7f5b2472a7edce0e..f36b64cd8c1bbef299f214d884a2349002c782cb 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -825,7 +825,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     im = new InputManager( this, p_intf );
 
     var_AddCallback( THEPL, "item-change", ItemChanged, im );
-    var_AddCallback( THEPL, "playlist-current", PLItemChanged, this );
+    var_AddCallback( THEPL, "item-current", PLItemChanged, this );
     var_AddCallback( THEPL, "activity", PLItemChanged, this );
 
     var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, this );
@@ -836,7 +836,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
 
     /* emit check if playlist has allready started playing */
     vlc_value_t val;
-    var_Change( THEPL, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
+    var_Change( THEPL, "item-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
 
     IMEvent *event = new IMEvent( ItemChanged_Type, val.i_int);
     customEvent( event );
@@ -857,7 +857,7 @@ MainInputManager::~MainInputManager()
     var_DelCallback( THEPL, "activity", PLItemChanged, this );
     var_DelCallback( THEPL, "item-change", ItemChanged, im );
 
-    var_DelCallback( THEPL, "playlist-current", PLItemChanged, this );
+    var_DelCallback( THEPL, "item-current", PLItemChanged, this );
 }
 
 vout_thread_t* MainInputManager::getVout()

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index bc86792f2fd563779823b1ca9caad91e732ac6fc..e5510221e5188e17e5d75a6011a311a373cda412 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -153,7 +153,7 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
     var_AddCallback( pIntf->p_libvlc, "intf-show",
                      onIntfShow, this );
     // Called when the current played item changes
-    var_AddCallback( pIntf->p_sys->p_playlist, "playlist-current",
+    var_AddCallback( pIntf->p_sys->p_playlist, "item-current",
                      onPlaylistChange, this );
     // Called when a playlist item changed
     var_AddCallback( pIntf->p_sys->p_playlist, "item-change",
@@ -189,7 +189,7 @@ VlcProc::~VlcProc()
                      onItemDelete, this );
     var_DelCallback( getIntf()->p_libvlc, "intf-show",
                      onIntfShow, this );
-    var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-current",
+    var_DelCallback( getIntf()->p_sys->p_playlist, "item-current",
                      onPlaylistChange, this );
     var_DelCallback( getIntf()->p_sys->p_playlist, "item-change",
                      onItemChange, this );

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 72bd1d33f5ac92f35ce3d0242fc5d18af121947d..ec3f5479e8e2bcb63b2b5dec19996b12a9681798 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -185,7 +185,7 @@ static int Open( vlc_object_t *p_this )
 
     p_playlist = pl_Hold( p_intf );
     PL_LOCK;
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     PL_UNLOCK;
     pl_Release( p_intf );
 
@@ -208,7 +208,7 @@ static void Close( vlc_object_t *p_this )
     if( p_playlist )
     {
 
-        var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+        var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
 
         p_input = playlist_CurrentInput( p_playlist );
         if ( p_input )

diff --git a/modules/misc/lua/libs/playlist.c b/modules/misc/lua/libs/playlist.c
index 404064dfb6ff36c104f1a3659890c0df47d290bf..58ce8c0bccdc456dbb87a75e82fab7d4c3acdaab 100644 (file)
--- a/modules/misc/lua/libs/playlist.c
+++ b/modules/misc/lua/libs/playlist.c
@@ -318,7 +318,7 @@ static int vlclua_playlist_search( lua_State *L )
 static int vlclua_playlist_current( lua_State *L )
 {
     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    lua_pushinteger( L, var_GetInteger( p_playlist, "playlist-current" ) );
+    lua_pushinteger( L, var_GetInteger( p_playlist, "item-current" ) );
     vlclua_release_playlist_internal( p_playlist );
     return 1;
 }

diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m
index 32abcb58f79fba9123775ceea327b0e6947688fb..21b9ad5bfb1d0522c92346aa7491243c19011e08 100644 (file)
--- a/modules/misc/notify/growl.m
+++ b/modules/misc/notify/growl.m
@@ -120,7 +120,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->default_icon = (CFDataRef) readFile( buf );
 
     playlist_t *p_playlist = pl_Hold( p_intf );
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
     RegisterToGrowl( p_this );
@@ -141,7 +141,7 @@ static void Close( vlc_object_t *p_this )
     free( p_sys );
 
     playlist_t *p_playlist = pl_Hold( p_this );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
+    var_DelCallback( p_playlist, "item-current", ItemChange, p_this );
     pl_Release( p_this );
 }
 

diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index dfa7d4de1f5a634dce34f82d37cf7c313b7a474b..4e980c11373237f5ec2f54fb07ce945340a864ea 100644 (file)
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -91,7 +91,7 @@ static int Open( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
     playlist_t *p_playlist = pl_Hold( p_intf );
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
     RegisterToGrowl( p_this );
@@ -104,7 +104,7 @@ static int Open( vlc_object_t *p_this )
 static void Close( vlc_object_t *p_this )
 {
     playlist_t *p_playlist = pl_Hold( p_this );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
+    var_DelCallback( p_playlist, "item-current", ItemChange, p_this );
     pl_Release( p_this );
 }
 

diff --git a/modules/misc/notify/msn.c b/modules/misc/notify/msn.c
index 78db5631f30e11552bd83653c306a15f79ce38cd..d38fcbf8c51703398e59cbe1d98b70601e881399 100644 (file)
--- a/modules/misc/notify/msn.c
+++ b/modules/misc/notify/msn.c
@@ -103,7 +103,7 @@ static int Open( vlc_object_t *p_this )
 
     p_playlist = pl_Hold( p_intf );
     var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
     return VLC_SUCCESS;
@@ -122,7 +122,7 @@ static void Close( vlc_object_t *p_this )
     SendToMSN( "\\0Music\\01\\0\\0\\0\\0\\0\\0\\0" );
 
     var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_this );
 
     /* Destroy structure */

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 2c6b0fd2430252de0a4c17235f0b932407c971d4..734574435bd253599f2c42ab4f7d8a92801a55a6 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -103,7 +103,7 @@ static int Open( vlc_object_t *p_this )
     p_intf->p_sys->notification = NULL;
 
     p_playlist = pl_Hold( p_intf );
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
     return VLC_SUCCESS;
@@ -118,7 +118,7 @@ static void Close( vlc_object_t *p_this )
     intf_sys_t      *p_sys  = p_intf->p_sys;
 
     playlist_t *p_playlist = pl_Hold( p_this );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
+    var_DelCallback( p_playlist, "item-current", ItemChange, p_this );
     pl_Release( p_this );
 
     if( p_intf->p_sys->notification )

diff --git a/modules/misc/notify/telepathy.c b/modules/misc/notify/telepathy.c
index 3c2e3d40ace7d35b6599d2599f7c27c2e7d27fc0..f2fff326dfebe723482837764c8e843fcce1fa98 100644 (file)
--- a/modules/misc/notify/telepathy.c
+++ b/modules/misc/notify/telepathy.c
@@ -126,7 +126,7 @@ static int Open( vlc_object_t *p_this )
 
     p_playlist = pl_Hold( p_intf );
     var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
     pl_Release( p_intf );
 
     return VLC_SUCCESS;
@@ -142,7 +142,7 @@ static void Close( vlc_object_t *p_this )
     input_thread_t *p_input = NULL;
 
     var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+    var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
     if( (p_input = playlist_CurrentInput( p_playlist )) )
     {
         var_DelCallback( p_input, "state", StateChange, p_intf );
@@ -177,7 +177,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     input_thread_t *p_input;
 
     /* Don't update Telepathy presence each time an item has been preparsed */
-    if( !strncmp( "playlist-current", psz_var, 16 ) )
+    if( !strncmp( "item-current", psz_var, 16 ) )
     { /* stores the current input item id */
         p_intf->p_sys->i_id = newval.i_int;
         p_intf->p_sys->i_item_changes = 0;
@@ -211,7 +211,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
         }
     }
 
-    if( !strncmp( "playlist-current", psz_var, 16 ) )
+    if( !strncmp( "item-current", psz_var, 16 ) )
         var_AddCallback( p_input, "state", StateChange, p_intf );
 
     /* We format the string to be displayed */

diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index a7b2b9ba00bea278205d98f65a5634e05c9eaf43..b080c66c5d9bc9a30d676fe43b87a3156efc807a 100644 (file)
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -154,7 +154,7 @@ static int Open( vlc_object_t *p_this )
 
 
     playlist_t *p_playlist = pl_Hold( p_intf );
-    var_AddCallback( p_playlist, "playlist-current", PlaylistNext, p_this );
+    var_AddCallback( p_playlist, "item-current", PlaylistNext, p_this );
     var_AddCallback( p_playlist, "item-change", PlaylistNext, p_this );
     pl_Release( p_intf );
 
@@ -195,7 +195,7 @@ static void Close( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
     playlist_t *p_playlist = pl_Hold( p_intf );
-    var_DelCallback( p_playlist, "playlist-current", PlaylistNext, p_this );
+    var_DelCallback( p_playlist, "item-current", PlaylistNext, p_this );
     var_DelCallback( p_playlist, "item-change", PlaylistNext, p_this );
     pl_Release( p_intf );
 

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index cd363ecac99e9c37c28b91ddab5f23a394cfb475..cf4d3f063a9790b8acf8e8b4f82d383d49c133dd 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -278,8 +278,8 @@ static void VariablesInit( playlist_t *p_playlist )
 
     var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS );
 
-    var_Create( p_playlist, "playlist-current", VLC_VAR_INTEGER );
-    var_SetInteger( p_playlist, "playlist-current", -1 );
+    var_Create( p_playlist, "item-current", VLC_VAR_INTEGER );
+    var_SetInteger( p_playlist, "item-current", -1 );
 
     var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
     var_SetInteger( p_playlist, "activity", 0 );

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 88036193ac068a34876ce6a0f61c1327e4d17570..5d1c60f4361bec770eaade93a9244978daeed25d 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -294,7 +294,7 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     }
 
     PL_UNLOCK;
-    var_SetInteger( p_playlist, "playlist-current", p_input->i_id );
+    var_SetInteger( p_playlist, "item-current", p_input->i_id );
     PL_LOCK;
 
     return VLC_SUCCESS;