[vlc-commits] playlist: remove "item-current" variable

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 26 21:26:36 2012 +0200| [6e9f6517682806c5148acb0eb2f0850be07b5e7f] | committer: Rémi Denis-Courmont

playlist: remove "item-current" variable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e9f6517682806c5148acb0eb2f0850be07b5e7f
---

 include/vlc_playlist.h |    1 -
 src/playlist/engine.c  |    1 -
 src/playlist/thread.c  |    2 --
 3 files changed, 4 deletions(-)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index ea269a2..d837e7d 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -102,7 +102,6 @@ TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t)
  *
  * - "item-change": It will contain the input_item_t->i_id of a changed input
  * item monitored by the playlist.
- * - "item-current": It will contain a input_item_t->i_id of the current
  * item being played.
  *
  * - "playlist-item-append": It will contain a pointer to a playlist_add_t.
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 42d554e..f0951e1 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -422,7 +422,6 @@ static void VariablesInit( playlist_t *p_playlist )
 
     var_Create( p_playlist, "playlist-item-append", VLC_VAR_ADDRESS );
 
-    var_Create( p_playlist, "item-current", VLC_VAR_ADDRESS );
     var_Create( p_playlist, "input-current", VLC_VAR_ADDRESS );
 
     var_Create( p_playlist, "activity", VLC_VAR_VOID );
diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 208b249..b2f8844 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -268,9 +268,7 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
         free( psz_arturl );
         free( psz_name );
     }
-    /* FIXME: this is not safe !!*/
     PL_UNLOCK;
-    var_SetAddress( p_playlist, "item-current", p_input );
     var_TriggerCallback( p_playlist, "activity" );
     PL_LOCK;