Changeset 16e518077e1c20ec40052157d9685b8468f2f0a7

Timestamp:

23/08/07 19:02:38 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1187888558 +0000

git-parent:

[2caa2480230a3cfc877b135485865b65b5482516]

git-author:

Rafaël Carré <funman@videolan.org> 1187888558 +0000

Message:

Merges ITEM_TYPE_VFILE and ITEM_TYPE_AFILE to ITEM_TYPE_FILE
There is no way at the moment to know if a file is audio only

Files:

• include/vlc_input.h (modified) (1 diff)
• modules/access/directory.c (modified) (1 diff)
• modules/gui/qt4/components/infopanels.cpp (modified) (1 diff)
• modules/gui/qt4/pixmaps/type_afile.xpm (deleted)
• modules/gui/qt4/pixmaps/type_file.xpm (added)
• modules/gui/qt4/pixmaps/type_vfile.xpm (deleted)
• modules/gui/qt4/playlist_model.cpp (modified) (2 diffs)
• src/input/item.c (modified) (3 diffs)

include/vlc_input.h

@@ -90 +90 @@
-
-#define ITEM_TYPE_UNKNOWN       0
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )

modules/access/directory.c

@@ -516 +516 @@
-                p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
-                                                 psz_uri, entry, 0, NULL,
-V
+
-                if (p_input != NULL)
-                {

modules/gui/qt4/components/infopanels.cpp

@@ -162 +162 @@
-    int i_type = p_input->i_type;
-    vlc_mutex_unlock( &p_input->lock );
-( i_type == ITEM_TYPE_AFILE ) || ( i_type == ITEM_TYPE_VFILE )
+i_type == ITEM_TYPE_FILE
-    {
-        char *psz_uri_orig = input_item_GetURI( p_input );

modules/gui/qt4/playlist_model.cpp

@@ -34 +34 @@
-
-#include "pixmaps/type_unknown.xpm"
-
-
+
-#include "pixmaps/type_net.xpm"
-#include "pixmaps/type_card.xpm"
@@ -277 +276 @@
-#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( type_##x##_xpm ) );
-    ADD_ICON( UNKNOWN , unknown );
-
-
+
-    ADD_ICON( DIRECTORY, directory );
-    ADD_ICON( DISC, disc );

src/input/item.c

@@ -246 +246 @@
-    if( psz_name != NULL )
-        p_input->psz_name = strdup( psz_name );
-
-
+
-    {
-        const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
@@ -298 +297 @@
-    };
-
-#if 0 /* Unused */
-    static struct { char *psz_search; int i_type; } exts_array[] =
-    {
-        { "mp3", ITEM_TYPE_AFILE },
-        { NULL, 0 }
-    };
-#endif
-
-    for( i = 0; types_array[i].psz_search != NULL; i++ )
-    {
@@ -315 +306 @@
-        }
-    }
-V
-
+
+