Changeset 499a384591d4238957f08348471fab5f36747fe7

Timestamp:

29/01/04 18:51:08 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1075398668 +0000

git-parent:

[6dc60921e4ccc73903b9b2d07dab30b546c6366f]

git-author:

Clément Stenac <zorglub@videolan.org> 1075398668 +0000

Message:

Options as infos were bad in several ways: it broke PLAYLIST_GO, used
much memory, and was inconsistent, especially with input_CreateThread
taking an array of options

* Revert to using array of options

* To add an item with options:

• either use playlist_ItemNew, ItemAddOption?, and then AddItem?
  (useful if you don't have all your options in an array)
  
• either use playlist_AddExt (use this if all your options are
  already in an array)
  

* To add an item without options: use playlist_Add

You can still add options after an item has been added by using either
playlist_AddOption or playlist_ItemAddOption

* Attempt to improve API and solve thread safety issues.

• playlist_Item* functions allow to touch items only.
  p_item->lock must be used when needed
  (playlist_ItemNew, playlist_ItemDelete, playlist_Item*Info,
  

playlist_ItemSet* )

• playlist_ItemGetById and ItemGetByPos? give you playlist_items
  for GetByPos?, you should have the playlist lock
  

At the moment, the playlist_Set* and playlist_*Info functions are kept (they work with position) but should be avoided.

Files:

• include/vlc_playlist.h (modified) (6 diffs)
• modules/access/cdda/access.c (modified) (8 diffs)
• modules/access/vcdx/access.c (modified) (4 diffs)
• modules/codec/speex.c (modified) (3 diffs)
• modules/codec/theora.c (modified) (3 diffs)
• modules/codec/vorbis.c (modified) (3 diffs)
• modules/control/http.c (modified) (5 diffs)
• modules/demux/util/id3tag.c (modified) (9 diffs)
• modules/gui/pda/pda_callbacks.c (modified) (2 diffs)
• modules/gui/wxwindows/iteminfo.cpp (modified) (4 diffs)
• modules/gui/wxwindows/open.cpp (modified) (5 diffs)
• modules/gui/wxwindows/playlist.cpp (modified) (9 diffs)
• modules/gui/wxwindows/streamwizard.cpp (modified) (4 diffs)
• modules/misc/sap.c (modified) (5 diffs)
• src/input/input.c (modified) (3 diffs)
• src/libvlc.c (modified) (3 diffs)
• src/misc/win32_specific.c (modified) (2 diffs)
• src/playlist/info.c (modified) (18 diffs)
• src/playlist/item-ext.c (modified) (16 diffs)
• src/playlist/item.c (modified) (2 diffs)
• src/playlist/loadsave.c (modified) (2 diffs)
• src/playlist/playlist.c (modified) (3 diffs)

include/vlc_playlist.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-6 2004/01/25 18:17:08
+7 2004/01/29 17:51:07
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -76 +76 @@
-    mtime_t    i_duration;     /**< A hint about the duration of this
-                                * item, in milliseconds*/
-
-
-
-
+
+
+
+
+
-    int        i_nb_played;    /**< How many times was this item played ? */
-    vlc_bool_t b_autodeletion; /**< Indicates whther this item is to
@@ -87 +88 @@
-    vlc_bool_t b_enabled;      /**< Indicates whether this item is to be
-                                * played or skipped */
- 
+
-    int        i_id;           /**< Unique id to track this item */
+    vlc_mutex_t lock;          /**< Item cannot be changed without this lock */
-};
-
@@ -166 +168 @@
-
-
-
+
+
+
+
+
+
+
+
-VLC_EXPORT( int,  playlist_Add,    ( playlist_t *, const char *, const char *, int, int ) );
-WDuration, ( playlist_t *, const char *, const char *, int, int, mtime_
-
-
+Ext, ( playlist_t *, const char *, const char *, int, int, mtime_t, const char **,in
+
+
-VLC_EXPORT( int,  playlist_Clear, ( playlist_t * ) );
-VLC_EXPORT( int,  playlist_Delete, ( playlist_t *, int ) );
@@ -179 +188 @@
-
-/* Basic item informations accessors */
-
-
-
+
+
+
+
+
+
+
-
-/* Item search functions */
-VLC_EXPORT( int, playlist_GetPositionById, (playlist_t *, int) );
-
+
+
-
-
@@ -196 +210 @@
-/* Info functions */
-VLC_EXPORT( char * , playlist_GetInfo, ( playlist_t * , int, const char *, const char *) );
-GetItem
+ItemGet
-
-VLC_EXPORT( item_info_category_t*, playlist_GetCategory, ( playlist_t *, int, const char *) );
-GetItem
+ItemGet
-
-VLC_EXPORT( item_info_category_t*, playlist_CreateCategory, ( playlist_t *, int, const char *) );
-CreateItem
+ItemCreate
-
-VLC_EXPORT( int, playlist_AddInfo, (playlist_t *, int, const char * , const char *, const char *, ...) );
-AddItem
+ItemAdd
-
-/* Option functions */
-, ...
-AddItemOption, (playlist_item_t *, const char *, ...
+
+ItemAddOption, (playlist_item_t *, const char *
-
-/* Playlist sorting */

modules/access/cdda/access.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
-2 2004/01/07 07:21:31 rocky
+3 2004/01/29 17:51:07 zorglub
- *
- * Authors: Rocky Bernstein <rocky@panix.com>
@@ -315 +315 @@
-    dbg_print( INPUT_DBG_META, "field %s: %s\n", title, str);  \
-    input_AddInfo( p_cat, _(title), "%s", str );               \
-
+
+
+
+
+
-                      _(title), "%s" , str );                  \
+    vlc_mutex_unlock( &p_item->lock );                         \
-  }
-
@@ -326 +331 @@
-                                            FIND_PARENT );
-  input_info_category_t *p_cat;
+  playlist_item_t *p_item;
-
-  p_cat = input_InfoCategory( p_input, "General" );
-
+
-
-#ifdef HAVE_LIBCDDB
@@ -670 +676 @@
-  char *p_title;
-  char *config_varname = MODULE_STRING "-title-format";
+  playlist_item_t *p_item;
-
-#ifdef HAVE_LIBCDDB
@@ -686 +693 @@
-  dbg_print( INPUT_DBG_META, "mrl: %s, title: %s, duration, %ld, pos %d",
-             psz_mrl, p_title, (long int) i_duration / 1000000 , i_pos );
-WDuration( p_playlist, psz_mrl, p_title, playlist_operation, 
-            i_pos, i_duration 
+Ext( p_playlist, psz_mrl, p_title, playlist_operation,
+                         i_pos, i_duration , NULL, 0
-
-  if( i_pos == PLAYLIST_END ) i_pos = p_playlist->i_size - 1;
+
+  vlc_mutex_lock( &p_playlist->object_lock );
+  p_item = playlist_ItemGetByPos( p_playlist, i_pos );
+  vlc_mutex_unlock( &p_playlist->object_lock );
+  if( !p_item )
+      return;
+
+  vlc_mutex_lock( &p_item->lock );
-
-  p_author =
@@ -696 +711 @@
-                   psz_mrl, i_track );
-
-AddInfo( p_playlist, i_pos,
+ItemAddInfo( p_item , 
-
-#ifdef HAVE_LIBCDDB
@@ -702 +717 @@
-    const char *psz_general_cat = _("General");
-
-AddInfo( p_playlist, i_pos
-       
-AddInfo( p_playlist, i_pos
-       
-AddInfo( p_playlist, i_pos
-       
-       
-AddInfo( p_playlist, i_pos
-       
+ItemAddInfo( p_item
+                
+ItemAddInfo( p_item
+                
+ItemAddInfo( p_item
+                  
+                
+ItemAddInfo( p_item
+                
-    if ( p_cdda->cddb.disc->discid ) {
-AddInfo( p_playlist, i_pos
-           
+ItemAddInfo( p_item
+                        
-    }
-    if (p_cdda->cddb.disc->year != 0) {
-AddInfo( p_playlist, i_pos
-           
+ItemAddInfo( p_item
+                        
-    }
-
-    if (p_cdda->i_cddb_enabled) {
-      cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                   
+                                        
-      if (t != NULL && t->artist != NULL) {
-   playlist_AddInfo( p_playlist, i_pos
-           
-   playlist_AddInfo( p_playlist, i_pos
-           
+        playlist_ItemAddInfo( p_item
+                        
+        playlist_ItemAddInfo( p_item 
+                        
-      }
-    }
@@ -734 +749 @@
-#endif /*HAVE_LIBCDDB*/
-
+  vlc_mutex_unlock( &p_item->lock );
-}
-

modules/access/vcdx/access.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 2000, 2003, 2004 VideoLAN
-7 2004/01/25 04:53:16 rocky
+8 2004/01/29 17:51:07 zorglub
- *
- * Authors: Rocky Bernstein <rocky@panix.com>
@@ -1004 +1004 @@
-
-static inline void
- 
-
-       
+
+
+             
-{
-  thread_vcd_data_t *p_vcd = (thread_vcd_data_t *) p_input->p_access_data;
-
+
+
-    dbg_print( INPUT_DBG_META, "field: %s: %s\n", title, str);
-
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -1019 +1027 @@
-
-static inline void
- 
-   
+
+        
-{
-  thread_vcd_data_t *p_vcd = (thread_vcd_data_t *) p_input->p_access_data;
+  playlist_item_t *p_item;
+
+  vlc_mutex_lock( &p_playlist->object_lock );
+  p_item = playlist_ItemGetByPos( p_playlist, -1 );
+  vlc_mutex_unlock( &p_playlist->object_lock );
+
-  dbg_print( INPUT_DBG_META, "field %s: %d\n", title, num);
-  input_AddInfo( p_cat, title, "%d", num );
-
-
-
-
+
+
+
+
+
+
-#define addstr(title, str) \
-  MetaInfoAddStr( p_input, p_cat, p_playlist, title, str );
@@ -1034 +1050 @@
-#define addnum(title, num) \
-  MetaInfoAddNum( p_input, p_cat, p_playlist, title, num );
-
+
-static void InformationCreate( input_thread_t *p_input  )
-{

modules/codec/speex.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003 VideoLAN
-0 2004/01/25 18:20:12 bigben
+1 2004/01/29 17:51:07 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -472 +472 @@
-    p_mode = speex_mode_list[p_sys->p_header->mode];
-    input_AddInfo( p_cat, _("Mode"), "%s%s",
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    p_mode->modeName, p_sys->p_header->vbr ? " VBR" : "" );
-
@@ -490 +501 @@
-
-    input_AddInfo( p_cat, p_buf, "" );
-
+
+
+
-
-    if( p_playlist ) vlc_object_release( p_playlist );

modules/codec/theora.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2004/01/25 18:20:12 bigben
+4 2004/01/29 17:51:07 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -341 +341 @@
-    playlist_t *p_playlist = vlc_object_find( p_dec, VLC_OBJECT_PLAYLIST,
-                                              FIND_ANYWHERE );
+    playlist_item_t *p_item;
-    int i = 0;
-    char *psz_name, *psz_value, *psz_comment;
@@ -358 +359 @@
-            psz_value++;
-            input_AddInfo( p_cat, psz_name, psz_value );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        free( psz_comment );

modules/codec/vorbis.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-0 2004/01/25 18:20:12 bigben
+1 2004/01/29 17:51:07 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -457 +457 @@
-    playlist_t *p_playlist = vlc_object_find( p_dec, VLC_OBJECT_PLAYLIST,
-                                              FIND_ANYWHERE );
+    playlist_item_t *p_item;
-    int i = 0;
-    char *psz_name, *psz_value, *psz_comment;
@@ -474 +475 @@
-            psz_value++;
-            input_AddInfo( p_cat, psz_name, psz_value );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        free( psz_comment );

modules/control/http.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
-0 2004/01/25 16:17:03 anil
+1 2004/01/29 17:51:07 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -126 +126 @@
-static char *Find_end_MRL( char *psz );
-
-
+intf_thread_t * , 
-
-/*****************************************************************************
@@ -1765 +1765 @@
-                    uri_extract_value( p_request, "mrl", mrl, 512 );
-                    uri_decode_url_encoded( mrl );
-
+p_intf, 
-
-                    if( !p_item || !p_item->psz_uri || !*p_item->psz_uri )
@@ -2871 +2871 @@
- * return NULL if there is an error.
- **********************************************************************/
-
+intf_thread_t *p_intf, 
-{
-    char **ppsz_options = NULL;
@@ -2968 +2968 @@
-    {
-        /* now create an item */
-
-
-
-
-
-
-
-
+
-        for( i = 0 ; i< i_options ; i++ )
-        {
-AddItem
+ItemAdd
-        }
-    }

modules/demux/util/id3tag.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
-19 2004/01/25 20:05:29 hartman
+20 2004/01/29 17:51:07 zorglub
- *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -86 +86 @@
-    while ( ( p_frame = id3_tag_findframe( p_id3_tag , "T", i ) ) )
-    {
-
+
+
+
+
+
+
+
+
-
-        int i_strings = id3_field_getnstrings( &p_frame->fields[1] );
@@ -102 +109 @@
-                    input_AddInfo( p_category, (char *)p_frame->description,
-                                   ppsz_genres[atoi(psz_temp)]);
-AddItem
+ItemAdd
-                                    (char *)p_frame->description,
-                                    ppsz_genres[atoi(psz_temp)]);
@@ -110 +117 @@
-                    input_AddInfo( p_category, (char *)p_frame->description,
-                                                psz_temp );
-AddItem
+ItemAdd
-                                    (char *)p_frame->description,
-                                    psz_temp);
@@ -129 +136 @@
-                input_AddInfo( p_category, (char *)p_frame->description,
-                                            psz_temp );
-AddItem
+ItemAdd
-                                        (char *)p_frame->description,
-                                    psz_temp);
@@ -137 +144 @@
-                if( p_item )
-                {
-AddItem
+ItemAdd
-                                          _("General"), _("Author"), psz_temp);
-                    val.b_bool = VLC_TRUE;
@@ -143 +150 @@
-                input_AddInfo( p_category, (char *)p_frame->description,
-                                            psz_temp );
-AddItem
+ItemAdd
-                                           (char *)p_frame->description,
-                                           psz_temp);
@@ -151 +158 @@
-                input_AddInfo( p_category, (char *)p_frame->description,
-                                            psz_temp );
-AddItem
+ItemAdd
-                                           (char *)p_frame->description,
-                                           psz_temp);
@@ -158 +165 @@
-        }
-        i++;
+        vlc_mutex_unlock( &p_item->lock );
-    }
-    id3_tag_delete( p_id3_tag );

modules/gui/pda/pda_callbacks.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-5 2004/01/25 14:15:21 kuehne
+6 2004/01/29 17:51:07 zorglub
- *
- * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
@@ -134 +134 @@
-#endif
-            {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            }
-

modules/gui/wxwindows/iteminfo.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
-7 2004/01/25 03:29:01 hartman
+8 2004/01/29 17:51:08 zorglub
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -179 +179 @@
-    author_text =
-                   new wxTextCtrl( info_panel, Uri_Event,
-GetItem
+ItemGet
-                                          _("General"), _("Author") ) ),
-                                   wxDefaultPosition, wxSize( 300, -1 ),
@@ -306 +306 @@
-void ItemInfoDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
-{
+    vlc_mutex_lock( &p_item->lock );
-    p_item->psz_name = strdup( name_text->GetLineText(0).mb_str() );
-    p_item->psz_uri = strdup( uri_text->GetLineText(0).mb_str() );
-AddItem
+ItemAdd
-                            author_text->GetLineText(0).mb_str() );
-    vlc_bool_t b_old_enabled = p_item->b_enabled;
@@ -336 +337 @@
-
-    p_item->b_enabled = enabled_checkbox->IsChecked() ? VLC_TRUE : VLC_FALSE ;
+    vlc_mutex_unlock( &p_item->lock );
-    EndModal( wxID_OK );
-}

modules/gui/wxwindows/open.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
-6 2004/01/26 22:10:20 gbazin
+7 2004/01/29 17:51:08 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -891 +891 @@
-    {
-        int i_options = 0;
-
-
-
-
-
+
+
+
+
-
-        /* Count the input options */
@@ -907 +906 @@
-        for( int j = 0; j < i_options; j++ )
-        {
-AddItem
+ItemAdd
-        }
-
@@ -915 +914 @@
-            for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ )
-            {
-AddItem
+ItemAdd
-            }
-        }
@@ -924 +923 @@
-            for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
-            {
-AddItem
+ItemAdd
-            }
-        }
+
+       int i_id = playlist_AddItem( p_playlist, p_item,
+                      PLAYLIST_APPEND, PLAYLIST_END );
-
-        if( !i && i_open_arg )

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
-39 2004/01/25 03:29:01 hartman
+40 2004/01/29 17:51:08 zorglub
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -406 +406 @@
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                       FIND_ANYWHERE );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    {
-        vlc_object_release(p_playlist);
-        return;
-    }
-
-
+
+
+
-                                       _("General") , _("Author") ) ) );
-    char *psz_group = playlist_FindGroup(p_playlist,
-playlist->pp_items[i]
+item
-    listview->SetItem( i, 2,
-             wxL2U( psz_group ? psz_group : _("Normal") ) );
-
-playlist->pp_items[i]
+item
-    {
-        wxListItem listitem;
@@ -432 +437 @@
-
-    char psz_duration[MSTRTIME_MAX_SIZE];
-playlist->pp_items[i]
+item
-    if( dur != -1 ) secstotimestr( psz_duration, dur/1000000 );
-    else memcpy( psz_duration , "-:--:--", sizeof("-:--:--") );
@@ -612 +617 @@
-            }
-        }
-
+
-        vlc_object_release( p_playlist );
-
+
-    }
-}
@@ -901 +906 @@
-        if( listview->IsSelected( item ) )
-        {
+            /*XXX*/
-            playlist_Enable( p_playlist, item );
-            UpdateItem( item );
@@ -922 +928 @@
-        if( listview->IsSelected( item ) )
-        {
+            /*XXX*/
-            playlist_Disable( p_playlist, item );
-            UpdateItem( item );
@@ -1022 +1029 @@
-    if( iteminfo_dialog == NULL )
-    {
-
+
+
+
+
+
-        {
-            iteminfo_dialog = new ItemInfoDialog(
-playlist->pp_items[i_item]
+item 
-            if( iteminfo_dialog->ShowModal()  == wxID_OK )
-                UpdateItem( i_item );
@@ -1061 +1072 @@
-       {
-           case EnableGroup_Event:
+               /*XXX*/
-               playlist_EnableGroup( p_playlist ,
-                                  p_playlist->pp_items[i_item]->i_group );
@@ -1169 +1181 @@
-{
-    Playlist *p_playlist_dialog = (Playlist *)param;
+    fprintf(stderr,"Update item: %i\n",new_val.i_int);
-    p_playlist_dialog->UpdateItem( new_val.i_int );
-    return 0;

modules/gui/wxwindows/streamwizard.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
-5 2004/01/25 03:29:01 hartman
+6 2004/01/29 17:51:08 zorglub
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -205 +205 @@
-    for( int i = 0; i < (int)p_open_dialog->mrl.GetCount(); i++ )
-    {
-int i_id = playlist_Add( p_playlist
+playlist_item_t *p_item = playlist_ItemNew( p_intf
-                      (const char *)p_open_dialog->mrl[i].mb_str(),
-
-
-
+
-        int i_options = 0;
-
@@ -223 +221 @@
-        for( int j = 0; j < i_options; j++ )
-        {
-AddOption( p_playlist, i_pos
+ItemAddOption( p_item 
-                  &nbs