Remove unused i_enabled member from the playlist struct

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index ce21567d782b519ea182f882ac6266e0fcf1af96..acddcf4ca8c1152526365dfba121d353797db4f9 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -170,8 +170,6 @@ struct playlist_t
     } ** pp_sds;
     int                   i_sds;   /**< Number of service discovery modules */
 
-    int                   i_enabled; /**< How many items are enabled ? */
-
     playlist_item_array_t items; /**< Arrays of items */
     playlist_item_array_t all_items; /**< Array of items and nodes */
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 0f83f9f9fa0ab2867daae7efd085ff786f2ef596..577accf483dee8c1e1c29f70aa5dbe09e70367f0 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -508,7 +508,7 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu,
             addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
                     ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
     }
-    else if( THEPL->items.i_size && THEPL->i_enabled )
+    else if( THEPL->items.i_size )
         addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
                 ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
 

diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 37cef1fdaa3e68f73c1fdeb9e9cabecc77a863cb..25f87953bd7a3e7e39f34611d0c578f4180557f7 100644 (file)
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -638,7 +638,7 @@ void Interface::OnPlayStream( void )
         vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
     if( p_playlist == NULL ) return;
 
-    if( p_playlist->i_size && p_playlist->i_enabled )
+    if( p_playlist->i_size )
     {
         vlc_value_t state;
 

diff --git a/modules/gui/wince/iteminfo.cpp b/modules/gui/wince/iteminfo.cpp
index 26a056eff43581ced310775518c6054f48a138c6..bfcd5a9dd232e01ba23c9549f56262702d546e31 100644 (file)
--- a/modules/gui/wince/iteminfo.cpp
+++ b/modules/gui/wince/iteminfo.cpp
@@ -274,11 +274,6 @@ void ItemInfoDialog::OnOk()
     if( p_playlist != NULL )
     {
         b_state = SendMessage( enabled_checkbox, BM_GETCHECK, 0, 0 );
-        if( b_old_enabled == false && (b_state & BST_CHECKED) )
-            p_playlist->i_enabled ++;
-        else if( b_old_enabled == true && (b_state & BST_UNCHECKED) )
-            p_playlist->i_enabled --;
-
         vlc_object_release( p_playlist );
     }
 

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index a4bd81a9284fceda0df383604cc637497bfe8897..256cf2a8bf30b17b0f1a7891f71b0acff8658c1e 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -1080,7 +1080,7 @@ void Interface::PlayStream()
                                        FIND_ANYWHERE );
     if( p_playlist == NULL ) return;
 
-    if( !playlist_IsEmpty(p_playlist) && p_playlist->i_enabled )
+    if( !playlist_IsEmpty(p_playlist) )
     {
         vlc_value_t state;
 

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 8899ed5a6df755c8f2ed02fb78e2ae1591985379..0abf61b7b0d70a90d5e5a1c14e8fc4d861bd15d1 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -808,7 +808,6 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 {
     ARRAY_APPEND(p_playlist->items, p_item);
     ARRAY_APPEND(p_playlist->all_items, p_item);
-    p_playlist->i_enabled ++;
 
     if( i_pos == PLAYLIST_END )
         playlist_NodeAppend( p_playlist, p_item, p_node );