Changeset 4b295c7cb26de39368086af8dc901df6bd29d135

Timestamp:

23/12/07 23:23:25 (10 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[0212c5155653272d0125e3b788a2ed4db09876de]

git-author:

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

Message:

Allow specifying options specific to each url in the shout service discovery.
Make it possible to inherit the m3u-extvlcopt option in the m3u parser.

Files:

• modules/demux/playlist/m3u.c (modified) (2 diffs)
• modules/services_discovery/shout.c (modified) (2 diffs)

modules/demux/playlist/m3u.c

@@ -110 +110 @@
-    int        i_options = 0;
-    vlc_bool_t b_cleanup = VLC_FALSE;
-
+
+
-    input_item_t *p_input;
-
@@ -221 +222 @@
-    }
-    HANDLE_PLAY_AND_RELEASE;
+    var_Destroy( p_demux, "m3u-extvlcopt" );
-    return 0; /* Needed for correct operation of go back */
-}

modules/services_discovery/shout.c

@@ -44 +44 @@
-    const char *psz_url;
-    const char *psz_name;
+    const char *ppsz_options[2];
-} p_items[] = {
-    { "http/shout-winamp://www.shoutcast.com/sbin/newxml.phtml",
-
+, { NULL }
-    { "http/shout-winamp://www.shoutcast.com/sbin/newtvlister.phtml?alltv=1",
-
+, { NULL }
-    { "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u",
-
+, { "m3u-extvlcopt=1", NULL }
-};
-
@@ -129 +130 @@
-{
-    enum type_e i_type = (enum type_e)p_sd->p_sys;
+    int i;
-    input_item_t *p_input = input_ItemNewExt( p_sd,
-                        p_items[i_type].psz_url, _(p_items[i_type].psz_name),
-                        0, NULL, -1 );
+    for( i = 0; p_items[i_type].ppsz_options[i] != NULL; i++ )
+        input_ItemAddOption( p_input, p_items[i_type].ppsz_options[i] );
-    input_ItemAddOption( p_input, "no-playlist-autostart" );
+
-
-    vlc_gc_incref( p_input );