[vlc-commits] playlist: remove unused remove flag

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 15 23:25:19 2016 +0200| [d5f4d48d72b33a477b159edc0d966e00b21ab8e4] | committer: Rémi Denis-Courmont

playlist: remove unused remove flag

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

 include/vlc_playlist.h      |  1 -
 modules/lua/libs/playlist.c |  1 -
 share/lua/README.txt        |  1 -
 src/playlist/engine.c       | 14 --------------
 4 files changed, 17 deletions(-)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 9c365a7..05296b3 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -148,7 +148,6 @@ typedef enum {
     PLAYLIST_SKIP_FLAG         = 0x0002,  /**< Must playlist skip after it ? */
     PLAYLIST_DBL_FLAG          = 0x0004,  /**< Is it disabled ? */
     PLAYLIST_RO_FLAG           = 0x0008,  /**< Write-enabled ? */
-    PLAYLIST_REMOVE_FLAG       = 0x0010,  /**< Remove this item at the end */
     PLAYLIST_EXPANDED_FLAG     = 0x0020,  /**< Expanded node */
     PLAYLIST_SUBITEM_STOP_FLAG = 0x0040,  /**< Must playlist stop if the item gets subitems ?*/
     PLAYLIST_NO_INHERIT_FLAG   = 0x0080,  /**< Childs must not inherit flags from parent node */
diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
index c44571f..07260a8 100644
--- a/modules/lua/libs/playlist.c
+++ b/modules/lua/libs/playlist.c
@@ -214,7 +214,6 @@ static void push_playlist_item( lua_State *L, playlist_item_t *p_item )
     CHECK_AND_SET_FLAG( SKIP, skip )
     CHECK_AND_SET_FLAG( DBL, disabled )
     CHECK_AND_SET_FLAG( RO, ro )
-    CHECK_AND_SET_FLAG( REMOVE, remove )
     CHECK_AND_SET_FLAG( EXPANDED, expanded )
 #undef CHECK_AND_SET_FLAG
     lua_setfield( L, -2, "flags" );
diff --git a/share/lua/README.txt b/share/lua/README.txt
index 50e7d81..48af9c1 100644
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -289,7 +289,6 @@ playlist.get( [what, [tree]] ): Get the playlist.
           .skip
           .disabled
           .ro
-          .remove
           .expanded
       .name:
       .path:
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 85f77e9..80b6521 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -400,13 +400,6 @@ void set_current_status_item( playlist_t * p_playlist,
 {
     PL_ASSERT_LOCKED;
 
-    if( pl_priv(p_playlist)->status.p_item &&
-        pl_priv(p_playlist)->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG &&
-        pl_priv(p_playlist)->status.p_item != p_item )
-    {
-        /* It's unsafe given current design to delete a playlist item :(
-        playlist_ItemDelete( pl_priv(p_playlist)->status.p_item ); */
-    }
     pl_priv(p_playlist)->status.p_item = p_item;
 }
 
@@ -415,13 +408,6 @@ void set_current_status_node( playlist_t * p_playlist,
 {
     PL_ASSERT_LOCKED;
 
-    if( pl_priv(p_playlist)->status.p_node &&
-        pl_priv(p_playlist)->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG &&
-        pl_priv(p_playlist)->status.p_node != p_node )
-    {
-        /* It's unsafe given current design to delete a playlist item :(
-        playlist_ItemDelete( pl_priv(p_playlist)->status.p_node ); */
-    }
     pl_priv(p_playlist)->status.p_node = p_node;
 }