Qt: CaptureOpenPanel: check and prefill with usual devices

[vlc] / modules / demux / playlist / dvb.c

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index dac8629494c108ff0e2bd21d2951c3517638231d..15e057894eeaa3230540ba80fbade71ee0a0468b 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dvb.c : DVB channel list import (szap/tzap/czap compatible channel lists)
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-20009 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_interface.h>
 #include <vlc_charset.h>
 
 #include "playlist.h"
@@ -101,12 +100,14 @@ static int Demux( demux_t *p_demux )
 {
     char       *psz_line;
     input_item_t *p_input;
-    INIT_PLAYLIST_STUFF;
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
+
+    input_item_node_t *p_subitems = input_item_node_Create( p_current_input );
 
     while( (psz_line = stream_ReadLine( p_demux->s )) )
     {
         char **ppsz_options = NULL;
-        int  i, i_options = 0;
+        int  i_options = 0;
         char *psz_name = NULL;
 
         if( !ParseLine( psz_line, &psz_name, &ppsz_options, &i_options ) )
@@ -116,22 +117,24 @@ static int Demux( demux_t *p_demux )
         }
 
         EnsureUTF8( psz_name );
-
-        p_input = input_item_NewExt( p_demux, "dvb://", psz_name, 0, NULL, 0, -1 );
-        for( i = 0; i< i_options; i++ )
-        {
+        for( int i = 0; i< i_options; i++ )
             EnsureUTF8( ppsz_options[i] );
-            input_item_AddOption( p_input, ppsz_options[i], VLC_INPUT_OPTION_TRUSTED );
-        }
-        input_item_AddSubItem( p_current_input, p_input );
+
+        p_input = input_item_NewExt( p_demux, "dvb://", psz_name,
+                                     i_options, (const char**)ppsz_options, VLC_INPUT_OPTION_TRUSTED, -1 );
+        input_item_node_AppendItem( p_subitems, p_input );
         vlc_gc_decref( p_input );
-        while( i_options-- ) free( ppsz_options[i_options] );
+
+        while( i_options-- )
+            free( ppsz_options[i_options] );
         free( ppsz_options );
 
         free( psz_line );
     }
 
-    HANDLE_PLAY_AND_RELEASE;
+    input_item_node_PostAndDelete( p_subitems );
+
+    vlc_gc_decref(p_current_input);
     return 0; /* Needed for correct operation of go back */
 }
 
@@ -211,8 +214,8 @@ static int ParseLine( char *psz_line, char **ppsz_name,
     while( psz_parse )
     {
         const char *psz_option = NULL;
-        char *psz_end = strchr( psz_parse, ':' );
-        if( psz_end ) { *psz_end = 0; psz_end++; }
+        char *psz_option_end = strchr( psz_parse, ':' );
+        if( psz_option_end ) { *psz_option_end = 0; psz_option_end++; }
 
         if( i_count == 0 )
         {
@@ -278,7 +281,7 @@ static int ParseLine( char *psz_line, char **ppsz_name,
                              psz_dup );
         }
 
-        psz_parse = psz_end;
+        psz_parse = psz_option_end;
         i_count++;
     }