playlist: move i_nb_played to playlist item, not the input item

This is accessed with the playlock lock anyway.

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index a70104457b778bcd178e27e3f6de2a32b13b4bfa..1bfb2f96f896665d32c344548e66eba9fb69b4f9 100644 (file)
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -74,7 +74,6 @@ struct input_item_t
     es_format_t **es;                /**< Es formats */
 
     input_stats_t *p_stats;          /**< Statistics */
-    int           i_nb_played;       /**< Number of times played */
 
     vlc_meta_t *p_meta;
 

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 2c64a7c2666de2f19cdc8d0aba527ac2fdc53624..384221bf587a8dc7fbd467d42229c49a49e6066f 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -138,6 +138,7 @@ struct playlist_item_t
     playlist_item_t      **pp_children; /**< Children nodes/items */
     playlist_item_t       *p_parent;    /**< Item parent */
     int                    i_children;  /**< Number of children, -1 if not a node */
+    unsigned               i_nb_played; /**< Times played */
 
     int                    i_id;        /**< Playlist item specific id */
     uint8_t                i_flags;     /**< Flags \see playlist_item_flags_e */

diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
index ab4faf1329f67f0a7c3e785999ee1045827a5d84..8bcc8a7cda24ed5d03904adb9036a3e773c707ab 100644 (file)
--- a/modules/lua/libs/playlist.c
+++ b/modules/lua/libs/playlist.c
@@ -233,7 +233,7 @@ static void push_playlist_item( lua_State *L, playlist_item_t *p_item )
         else
             lua_pushnumber( L, ((double)p_input->i_duration)*1e-6 );
         lua_setfield( L, -2, "duration" );
-        lua_pushinteger( L, p_input->i_nb_played );
+        lua_pushinteger( L, p_item->i_nb_played );
         lua_setfield( L, -2, "nb_played" );
         luaopen_input_item( L, p_input );
         /* TODO: add (optional) info categories, meta, options, es */

diff --git a/src/input/item.c b/src/input/item.c
index 4f0b0531e48a03376fca918841031bc490082b92..40b854e7ee2218c71f9a0ee00d881f63a8c917fb 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -851,7 +851,6 @@ input_item_NewWithType( const char *psz_uri, const char *psz_name,
     TAB_INIT( p_input->i_categories, p_input->pp_categories );
     TAB_INIT( p_input->i_es, p_input->es );
     p_input->p_stats = NULL;
-    p_input->i_nb_played = 0;
     p_input->p_meta = NULL;
     TAB_INIT( p_input->i_epg, p_input->pp_epg );
 

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 92814819d9b563860cddcb63da1abbda5866c251..eafc79e0196751b3cd57b5457cc5ca7a3f458e01 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -237,6 +237,7 @@ playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,
     p_item->p_parent = NULL;
     p_item->i_children = -1;
     p_item->pp_children = NULL;
+    p_item->i_nb_played = 0;
     p_item->i_flags = 0;
     p_item->p_playlist = p_playlist;
 

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 8130056df4cadc583702fc0f490d04a11794cc06..0e51f6058cb5a3c159d913112d724356a925ae7c 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -201,7 +201,7 @@ static void PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
 
     msg_Dbg( p_playlist, "creating new input thread" );
 
-    p_input->i_nb_played++;
+    p_item->i_nb_played++;
     set_current_status_item( p_playlist, p_item );
 
     p_sys->status.i_status = PLAYLIST_RUNNING;

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index eca12b1e6625f01edaac114e7da1c1ba129c90bb..9fe3c2406e334dbc5c070f613e0ba6af9045bdee 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -323,7 +323,7 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist,
         {
             if( b_ena && p_next->i_flags & PLAYLIST_DBL_FLAG )
                 b_ena_ok = false;
-            if( b_unplayed && p_next->p_input->i_nb_played != 0 )
+            if( b_unplayed && p_next->i_nb_played != 0 )
                 b_unplayed_ok = false;
             if( b_ena_ok && b_unplayed_ok ) break;
         }
@@ -364,7 +364,7 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
         {
             if( b_ena && p_prev->i_flags & PLAYLIST_DBL_FLAG )
                 b_ena_ok = false;
-            if( b_unplayed && p_prev->p_input->i_nb_played != 0 )
+            if( b_unplayed && p_prev->i_nb_played != 0 )
                 b_unplayed_ok = false;
             if( b_ena_ok && b_unplayed_ok ) break;
         }