Changeset 6c0ceeb39cf4038daffa2e078e49e39949342bc3

Timestamp:

16/01/05 15:10:47 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[f2797b3effbd173cb2aa7c1a267fa19fe3eb100a]

git-author:

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

Message:

Remove playlist info accessors (as they now belong to input_item) and use vlc_input_item_AddInfo and vlc_input_item_GetInfo instead

Files:

• Makefile.am (modified) (1 diff)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_playlist.h (modified) (1 diff)
• modules/access/cdda/info.c (modified) (2 diffs)
• modules/gui/macosx/playlistinfo.m (modified) (1 diff)
• modules/gui/wince/iteminfo.cpp (modified) (2 diffs)
• modules/gui/wince/wince.h (modified) (1 diff)
• modules/gui/wxwindows/iteminfo.cpp (modified) (3 diffs)
• modules/gui/wxwindows/playlist.cpp (modified) (2 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (1 diff)
• src/input/control.c (modified) (3 diffs)
• src/input/input.c (modified) (1 diff)
• src/playlist/info.c (deleted)
• src/playlist/item.c (modified) (3 diffs)
• src/playlist/sort.c (modified) (1 diff)

Makefile.am

@@ -331 +331 @@
-    src/playlist/item.c \
-    src/playlist/item-ext.c \
-    src/playlist/info.c \
-    src/playlist/services_discovery.c \
-    src/input/access.c \

include/vlc_input.h

@@ -159 +159 @@
-}
-
+VLC_EXPORT( char *, vlc_input_item_GetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
+VLC_EXPORT(int, vlc_input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
+
-/*****************************************************************************
- * Seek point: (generalisation of chapters)

include/vlc_playlist.h

@@ -332 +332 @@
-VLC_EXPORT( int, playlist_GetPositionById, (playlist_t *,int ) );
-
-/* Info functions */
-VLC_EXPORT( char * , playlist_GetInfo, ( playlist_t * , int, const char *, const char *) );
-VLC_EXPORT( char * , playlist_ItemGetInfo, ( playlist_item_t * , const char *, const char *) );
-
-VLC_EXPORT( info_category_t*, playlist_ItemGetCategory, ( playlist_item_t *, const char *) );
-
-VLC_EXPORT( info_category_t*, playlist_ItemCreateCategory, ( playlist_item_t *, const char *) );
-
-VLC_EXPORT( int, playlist_AddInfo, (playlist_t *, int, const char * , const char *, const char *, ...) );
-VLC_EXPORT( int, playlist_ItemAddInfo, (playlist_item_t *, const char * , const char *, const char *, ...) );
-VLC_EXPORT( int, playlist_ItemAddOption, (playlist_item_t *, const char *) );
-

modules/access/cdda/info.c

@@ -802 +802 @@
-    if (FIELD && strlen(FIELD))                                          \
-    {                                                                    \
-playlist_ItemAddInfo( p_item, _("Track"), _(TITLE),          
+vlc_input_item_AddInfo( &p_item->input, _("Track"), _(TITLE),
-                              "%s", FIELD);                              \
-    }
@@ -845 +845 @@
-
-int CDDAAddMetaToItem( access_t *p_access, cdda_data_t *p_cdda,
- 
-       
+
+                
-{
-    vlc_mutex_lock( &p_item->input.lock );
-
-    add_playlist_track_info_str("Source",  p_cdda->psz_source);
-playlist_ItemAddInfo( p_item
-
+vlc_input_item_AddInfo( &p_item->input
+ 
-
-    if (p_cdda->p_cdtext[i_track])

modules/gui/macosx/playlistinfo.m

@@ -151 +151 @@
-        p_item->input.psz_uri = strdup( [[o_uri_txt stringValue] UTF8String] );
-        p_item->input.psz_name = strdup( [[o_title_txt stringValue] UTF8String] );
-playlist_ItemAddInfo( p_item
+vlc_input_item_AddInfo( &p_item->input
-        vlc_mutex_unlock( &p_item->input.lock );
-        

modules/gui/wince/iteminfo.cpp

@@ -132 +132 @@
-            70, 10 + 15 + 10 - 3, rcClient.right - 70 - 10, 15 + 6,
-            hwnd, NULL, hInst, NULL);
-
-        /* Author Textbox */
-        author_label = CreateWindow( _T("STATIC"), _T("Author:"),
-                         WS_CHILD | WS_VISIBLE | SS_RIGHT ,
-                         0, 10 + 2*( 15 + 10 ), 60, 15,
-                         hwnd, NULL, hInst, NULL);
-
-        author_text = CreateWindow( _T("EDIT"),
-            _FROMMB(playlist_ItemGetInfo( p_item, _("General"), _("Author") )),
-            WS_CHILD | WS_VISIBLE | WS_BORDER | SS_LEFT | ES_AUTOHSCROLL,
-            70, 10 + 2*( 15 + 10 ) - 3, rcClient.right - 70 - 10, 15 + 6,
-            hwnd, NULL, hInst, NULL );
-
-        /* CheckBox */
@@ -291 +279 @@
-    p_item->input.psz_uri = strdup( _TOMB(psz_uri) );
-
-    TCHAR psz_author[MAX_PATH];
-    Edit_GetText( author_text, psz_author, MAX_PATH );
-    playlist_ItemAddInfo( p_item, "General", "Author", _TOMB(psz_author) );
-
-    vlc_bool_t b_old_enabled = p_item->b_enabled;
-

modules/gui/wince/wince.h

@@ -253 +253 @@
-    HWND name_label;
-    HWND name_text;
-
-    HWND author_label;
-    HWND author_text;
-
-    HWND checkbox_label;

modules/gui/wxwindows/iteminfo.cpp

@@ -52 +52 @@
-    Uri_Event,
-    Name_Event,
-    Author_Event,
-    Enabled_Event,
-};
@@ -156 +155 @@
-    sizer->Add( name_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
-
-    /* Author Textbox */
-    wxStaticText *author_label =
-           new wxStaticText( info_panel, -1, wxU(_("Author")) );
-
-    author_text = new wxTextCtrl( info_panel, Uri_Event,
-                                   wxU( playlist_ItemGetInfo( p_item,
-                                          _("General"), _("Author") ) ),
-                                   wxDefaultPosition, wxSize( 300, -1 ),
-                                   wxTE_PROCESS_ENTER);
-
-    sizer->Add( author_label, 0 , wxALIGN_LEFT | wxALL , 5 );
-    sizer->Add( author_text, 1 , wxALIGN_RIGHT | wxALL , 5);
-
-    /* Treeview */
-    info_tree = new wxTreeCtrl( info_panel, -1, wxDefaultPosition,
@@ -222 +208 @@
-    p_item->input.psz_name = strdup( name_text->GetLineText(0).mb_str() );
-    p_item->input.psz_uri = strdup( uri_text->GetLineText(0).mb_str() );
-    playlist_ItemAddInfo( p_item,"General","Author",
-                            author_text->GetLineText(0).mb_str() );
-    vlc_mutex_unlock( &p_item->input.lock );
-    EndModal( wxID_OK );

modules/gui/wxwindows/playlist.cpp

@@ -518 +518 @@
-    wxString msg;
-    wxString duration = wxU( "" );
-
+
+
-                                                     _("Artist"));
-    char psz_duration[MSTRTIME_MAX_SIZE];
@@ -527 +528 @@
-        secstotimestr( psz_duration, dur/1000000 );
-        duration.Append( wxU( " ( " ) +  wxString( wxU( psz_duration ) ) +
-
+ 
-    }
-

modules/gui/wxwindows/wxwindows.h

@@ -941 +941 @@
-    wxTextCtrl *uri_text;
-    wxTextCtrl *name_text;
-    wxTextCtrl *author_text;
-
-    wxTreeCtrl *info_tree;

src/input/control.c

@@ -130 +130 @@
-        case INPUT_ADD_INFO:
-        {
+            /* FIXME : Impossible to use vlc_input_item_AddInfo because of
+             * the ... problem ? */
-            char *psz_cat = (char *)va_arg( args, char * );
-            char *psz_name = (char *)va_arg( args, char * );
@@ -205 +207 @@
-            *ppsz_value = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            return i_ret;
-        }
@@ -443 +421 @@
-
-            vlc_mutex_lock( &p_input->input.p_item->lock );
-            
+
-            for( i = 0; i < p_input->input.p_item->i_options; i++ )
-            {

src/input/input.c

@@ -2443 +2443 @@
-             *pi_title_end, *pi_chapter_end );
-}
+
+
+/***********************************************************************
+ * Info management functions
+ ***********************************************************************/
+char *vlc_input_item_GetInfo( input_item_t *p_i,
+                              const char *psz_cat,
+                              const char *psz_name )
+{
+    int i,j;
+
+    vlc_mutex_lock( &p_i->lock );
+
+    for( i = 0 ; i< p_i->i_categories  ; i++ )
+    {
+        info_category_t *p_cat = p_i->pp_categories[i];
+
+        if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
+            continue;
+
+        for( j = 0; j < p_cat->i_infos ; j++ )
+        {
+            if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
+            {
+                vlc_mutex_unlock( &p_i->lock );
+                return strdup( p_cat->pp_infos[j]->psz_value );
+            }
+        }
+    }
+    vlc_mutex_unlock( &p_i->lock );
+    return strdup( "" );
+}
+
+int vlc_input_item_AddInfo( input_item_t *p_i,
+                            const char *psz_cat,
+                            const char *psz_name,
+                            const char *psz_format, ... )
+{
+    va_list args;
+    int i;
+    info_t *p_info = NULL;
+    info_category_t *p_cat = NULL ;
+
+    vlc_mutex_lock( &p_i->lock );
+
+    for( i = 0 ; i < p_i->i_categories ; i ++ )
+    {
+        if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) )
+        {
+            p_cat = p_i->pp_categories[i];
+            break;
+        }
+    }
+    if( !p_cat )
+    {
+        if( ( p_cat = (info_category_t *)malloc(
+                                     sizeof( info_category_t ) ) )  == NULL )
+        {
+            vlc_mutex_unlock( &p_i->lock );
+            return VLC_EGENERIC;
+        }
+        p_cat->psz_name = strdup( psz_cat );
+        p_cat->i_infos = 0;
+        p_cat->pp_infos = 0;
+        INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories,
+                     p_cat );
+    }
+
+    for( i = 0; i< p_cat->i_infos; i++ )
+    {
+        if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+        {
+            p_info = p_cat->pp_infos[i];
+            break;
+        }
+    }
+
+    if( !p_info )
+    {
+        if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
+        {
+            vlc_mutex_unlock( &p_i->lock );
+            return VLC_EGENERIC;
+        }
+        INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
+        p_info->psz_name = strdup( psz_name );
+    }
+    else
+    {
+        if( p_info->psz_value ) free( p_info->psz_value );
+    }
+
+    va_start( args, psz_format );
+    vasprintf( &p_info->psz_value, psz_format, args);
+    va_end( args );
+
+    vlc_mutex_unlock( &p_i->lock );
+
+    return VLC_SUCCESS;
+}
+

src/playlist/item.c

@@ -28 +28 @@
-#include <vlc/input.h>
-
+#include "vlc_input.h"
-#include "vlc_playlist.h"
-
@@ -87 +88 @@
-    if( p_item->input.i_type == ITEM_TYPE_UNKNOWN )
-        GuessType( &p_item->input );
-
-    playlist_ItemCreateCategory( p_item, _("General") );
-
-    return p_item;
@@ -277 +276 @@
-            memcpy( psz_buffer, "--:--:--", sizeof("--:--:--") );
-        }
-playlist_ItemAddInfo( p_item
-
+vlc_input_item_AddInfo( &p_item->input
+  
-
-        return VLC_SUCCESS;

src/playlist/sort.c

@@ -238 +238 @@
-        else if ( i_mode == SORT_AUTHOR )
-        {
-playlist_ItemGetInfo( pp_items[i]
+vlc_input_item_GetInfo( &pp_items[i]->input
-                            _("Meta-information"), _( "Artist" ) );
-        }