Changeset 2ffa2bd3d0a506be2a6c9e53edffeee442350397

Timestamp:

01/10/06 21:07:48 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1159729668 +0000

git-parent:

[19f542a35b43fadc821547fea49f7cbd90ad0b69]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1159729668 +0000

Message:

src/input/item.c: if we don't have an item name and item is a file, then only use the filename (and not the full path) as the item's name
others: if we only have a path and no interesting name, let the core decide what name to use

Files:

• modules/control/http/rpn.c (modified) (1 diff)
• modules/control/rc.c (modified) (1 diff)
• modules/demux/playlist/gvp.c (modified) (1 diff)
• modules/demux/playlist/qtl.c (modified) (1 diff)
• modules/gui/beos/InterfaceWindow.cpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.cpp (modified) (4 diffs)
• modules/gui/skins2/commands/cmd_add_item.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/dialogs.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/dialogs/open.cpp (modified) (1 diff)
• modules/gui/wxwidgets/interface.cpp (modified) (1 diff)
• src/input/item.c (modified) (1 diff)
• src/libvlc-common.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/misc/win32_specific.c (modified) (2 diffs)

modules/control/http/rpn.c

@@ -844 +844 @@
-            mrl = tmp;
-
-
-
-
-
-
-
-
-
+
-
-            if( !p_input || !p_input->psz_uri || !*p_input->psz_uri )

modules/control/rc.c

@@ -2291 +2291 @@
-    if( psz_item_mrl )
-    {
-psz_item_mrl
+NULL
-        for( i = 0; i < i_options; i++ )
-        {

modules/demux/playlist/gvp.c

@@ -69 +69 @@
-    byte_t *p_peek;
-
+    /* FIXME: we need to skip comment lines !!!! */
-    CHECK_PEEK( p_peek, 12 );
-    if( !POKE( p_peek, "gvp_version:", 12 ) )

modules/demux/playlist/qtl.c

@@ -370 +370 @@
-        {
-            p_input = input_ItemNewExt( p_sys->p_playlist,
-psz_qtnext
+NULL
-            playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
-                            p_sys->p_current, p_sys->p_item_in_category,

modules/gui/beos/InterfaceWindow.cpp

@@ -750 +750 @@
-                if( p_playlist )
-                {
-path.Path()
+NULL
-                                  PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
-                }

modules/gui/qt4/dialogs_provider.cpp

@@ -208 +208 @@
-    {
-        const char * psz_utf8 = qtu( file );
-psz_utf8
+NULL
-                     PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END );
-    }
@@ -233 +233 @@
-        const char * psz_utf8 = qtu( files[i] );
-        /* Play the first one, parse and enqueue the other ones */
-psz_utf8
+NULL
-                     PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
-                     ( i ? PLAYLIST_PREPARSE : 0 ),
@@ -257 +257 @@
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-psz_utf8
+NULL
-                                               0, NULL, -1 );
-    playlist_PlaylistAddInput( THEPL, p_input,
@@ -268 +268 @@
-                                                     _("Open directory") );
-    const char *psz_utf8 = qtu( dir );
-psz_utf8
+NULL
-                                               0, NULL, -1 );
-    playlist_MLAddInput( THEPL, p_input, PLAYLIST_APPEND, PLAYLIST_END );

modules/gui/skins2/commands/cmd_add_item.cpp

@@ -38 +38 @@
-    {
-        // Enqueue and play the item
-m_name.c_str()
+ NULL
-                              PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
-    }
@@ -44 +44 @@
-    {
-        // Enqueue the item only
-m_name.c_str()
+NULL
-                              PLAYLIST_APPEND, PLAYLIST_END );
-    }

modules/gui/wxwidgets/dialogs.cpp

@@ -447 +447 @@
-            char *psz_utf8 = wxFromLocale( paths[i] );
-            if( event.GetInt() )
-psz_utf8
+NULL
-                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
-                              (i ? PLAYLIST_PREPARSE : 0 ),
-                              PLAYLIST_END );
-            else
-psz_utf8
+NULL
-                              PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END );
-            wxLocaleFree( psz_utf8 );
@@ -478 +478 @@
-        wxString path = p_dir_dialog->GetPath();
-        char *psz_utf8 = wxFromLocale( path );
-psz_utf8
+NULL
-                      PLAYLIST_APPEND | (event.GetInt() ? PLAYLIST_GO : 0),
-                      PLAYLIST_END );

modules/gui/wxwidgets/dialogs/open.cpp

@@ -1170 +1170 @@
-
-        psz_utf8 = wxFromLocale( mrl[i] );
-psz_utf8
+NULL
-        wxLocaleFree( psz_utf8 );
-

modules/gui/wxwidgets/interface.cpp

@@ -1305 +1305 @@
-        char *psz_utf8 = wxDnDFromLocale( filenames[i] );
-
-psz_utf8
+NULL
-                      PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
-                      PLAYLIST_END );

src/input/item.c

@@ -242 +242 @@
-        p_input->psz_uri = NULL;
-
+    p_input->i_type = i_type;
+    p_input->b_prefers_tree = VLC_FALSE;
+
+    if( p_input->i_type == ITEM_TYPE_UNKNOWN )
+        GuessType( p_input );
+
-    if( psz_name != NULL )
-        p_input->psz_name = strdup( psz_name );
+    else if( p_input->i_type == ITEM_TYPE_AFILE
+             || p_input->i_type == ITEM_TYPE_VFILE )
+    {
+        char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
+        if( psz_filename && *psz_filename == DIR_SEP_CHAR )
+            psz_filename++;
+        p_input->psz_name = strdup( psz_filename && *psz_filename
+                                    ? psz_filename : p_input->psz_uri );
+    }
-    else
-
-
-
-
-
-
-
+
-
-    p_input->i_duration = i_duration;

src/libvlc-common.c

@@ -163 +163 @@
-    vlc_mutex_lock( lockval.p_address );
-
-    
-
-    i_instances++;
-

src/libvlc.c

@@ -316 +316 @@
-    LIBVLC_PLAYLIST_FUNC;
-    i_err = playlist_PlaylistAddExt( p_libvlc->p_playlist, psz_target,
-psz_target
+NULL
-                                     ppsz_options, i_options );
-    LIBVLC_PLAYLIST_FUNC_END;

src/misc/win32_specific.c

@@ -323 +323 @@
-                {
-                  playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
-ppsz_argv[i_opt]
+NULL
-                    PLAYLIST_END, -1,
-                    (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
@@ -329 +329 @@
-                } else {
-                  playlist_PlaylistAddExt( p_playlist, ppsz_argv[i_opt],
-ppsz_argv[i_opt]
+NULL
-                    PLAYLIST_END, -1,
-                    (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),