Changeset 5b093e36f6efdc9a834532bd962eecb62161a635

Timestamp:

09/28/07 18:08:55 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[abc92903eac6c54689270e8fc7c04848586730bf]

git-author:

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

Message:

Adds an input option "meta-file" to be used by input that aren't real inputs (like playlists).
Re-enables media library.
Fixes #1047 (nth attempt).

Files:

• include/vlc_playlist.h (modified) (1 diff)
• src/input/input.c (modified) (1 diff)
• src/playlist/loadsave.c (modified) (3 diffs)

include/vlc_playlist.h

@@ -447 +447 @@
-    input_item_t *p_input;
-    snprintf( psz_uri, 256+9, "file/://%s", psz_file );
-
+
+
+
-    playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END,
-                       VLC_TRUE, VLC_FALSE );

src/input/input.c

@@ -762 +762 @@
-    vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
-
+    for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+    {
+        if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+        {
+            msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
+            var_SetString( p_input, "sout", "" );
+            var_SetBool( p_input, "sout-all", VLC_FALSE );
+            var_SetString( p_input, "input-slave", "" );
+            var_SetInteger( p_input, "input-repeat", 0 );
+            var_SetString( p_input, "sub-file", "" );
+            var_SetBool( p_input, "sub-autodetect-file", VLC_FALSE );
+        }
+    }
+
-    if( !p_input->b_preparsing )
-    {

src/playlist/loadsave.c

@@ -90 +90 @@
-int playlist_MLLoad( playlist_t *p_playlist )
-{
-#if 0
-    const char *psz_datadir = p_playlist->p_libvlc->psz_datadir;
-    char *psz_uri = NULL;
@@ -123 +122 @@
-    }
-
+    const char *const psz_option = "meta-file";
-    p_input = input_ItemNewExt( p_playlist, psz_uri,
-0, NULL
+1, &psz_option
-    if( p_input == NULL )
-        goto error;
@@ -143 +143 @@
-error:
-    free( psz_uri );
-#endif
-    return VLC_ENOMEM;
-}