Renamed input_item_AddOpt to input_item_AddOption.

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

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 1dd1461d59959788721059eec9fe8c590c97ff1b..94d901ad731af022c37e8da042cdcbaf143ed087 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_interface.h>
 #include <vlc_charset.h>
@@ -51,14 +51,14 @@ static int ParseLine( char *, char **, char ***, int *);
 /*****************************************************************************
  * Import_DVB: main import function
  *****************************************************************************/
-int E_(Import_DVB)( vlc_object_t *p_this )
+int Import_DVB( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
     const uint8_t *p_peek;
     int     i_peek;
-    vlc_bool_t b_valid = VLC_FALSE;
+    bool b_valid = false;
 
-    if( !demux2_IsPathExtension( p_demux, ".conf" ) && !p_demux->b_force )
+    if( !demux_IsPathExtension( p_demux, ".conf" ) && !p_demux->b_force )
         return VLC_EGENERIC;
 
     /* Check if this really is a channels file */
@@ -74,7 +74,7 @@ int E_(Import_DVB)( vlc_object_t *p_this )
         }
         psz_line[i] = 0;
 
-        if( ParseLine( psz_line, 0, 0, 0 ) ) b_valid = VLC_TRUE;
+        if( ParseLine( psz_line, 0, 0, 0 ) ) b_valid = true;
     }
 
     if( !b_valid ) return VLC_EGENERIC;
@@ -89,7 +89,7 @@ int E_(Import_DVB)( vlc_object_t *p_this )
 /*****************************************************************************
  * Deactivate: frees unused data
  *****************************************************************************/
-void E_(Close_DVB)( vlc_object_t *p_this )
+void Close_DVB( vlc_object_t *p_this )
 {
     VLC_UNUSED(p_this);
 }
@@ -117,13 +117,13 @@ static int Demux( demux_t *p_demux )
 
         EnsureUTF8( psz_name );
 
-        p_input = input_ItemNewExt( p_playlist, "dvb:", psz_name, 0, NULL, -1 );
+        p_input = input_item_NewExt( p_demux, "dvb://", psz_name, 0, NULL, -1 );
         for( i = 0; i< i_options; i++ )
         {
             EnsureUTF8( ppsz_options[i] );
-            input_ItemAddOption( p_input, ppsz_options[i] );
+            input_item_AddOption( p_input, ppsz_options[i], VLC_INPUT_OPTION_TRUSTED );
         }
-        input_ItemAddSubItem( p_current_input, p_input );
+        input_item_AddSubItem( p_current_input, p_input );
         vlc_gc_decref( p_input );
         while( i_options-- ) free( ppsz_options[i_options] );
         free( ppsz_options );
@@ -135,7 +135,7 @@ static int Demux( demux_t *p_demux )
     return 0; /* Needed for correct operation of go back */
 }
 
-static struct
+static const struct
 {
     const char *psz_name;
     const char *psz_option;
@@ -193,24 +193,24 @@ static struct
 static int ParseLine( char *psz_line, char **ppsz_name,
                       char ***pppsz_options, int *pi_options )
 {
-    char *psz_name = 0, *psz_parse = psz_line;
-    int i_count = 0, i_program = 0, i_frequency = 0;
-    vlc_bool_t b_valid = VLC_FALSE;
+    char *psz_name = NULL, *psz_parse = psz_line;
+    int i_count = 0, i_program = 0, i_frequency = 0, i_symbolrate = 0;
+    bool b_valid = false;
 
-    if( pppsz_options ) *pppsz_options = 0;
+    if( pppsz_options ) *pppsz_options = NULL;
     if( pi_options ) *pi_options = 0;
-    if( ppsz_name ) *ppsz_name = 0;
+    if( ppsz_name ) *ppsz_name = NULL;
 
     /* Skip leading tabs and spaces */
     while( *psz_parse == ' ' || *psz_parse == '\t' ||
            *psz_parse == '\n' || *psz_parse == '\r' ) psz_parse++;
 
     /* Ignore comments */
-    if( *psz_parse == '#' ) return VLC_FALSE;
+    if( *psz_parse == '#' ) return false;
 
     while( psz_parse )
     {
-        const char *psz_option = 0;
+        const char *psz_option = NULL;
         char *psz_end = strchr( psz_parse, ':' );
         if( psz_end ) { *psz_end = 0; psz_end++; }
 
@@ -244,7 +244,7 @@ static int ParseLine( char *psz_line, char **ppsz_name,
 
                     /* If we recognize one of the strings, then we are sure
                      * the data is really valid (ie. a channels file). */
-                    b_valid = VLC_TRUE;
+                    b_valid = true;
                     break;
                 }
             }
@@ -257,6 +257,12 @@ static int ParseLine( char *psz_line, char **ppsz_name,
 
                 i_value = strtol( psz_parse, &psz_end, 10 );
                 if( psz_end != psz_parse &&
+                    i_value != LONG_MAX && i_value != LONG_MIN &&
+                    !i_symbolrate )
+                {
+                    i_symbolrate = i_value;
+                }
+                else if( psz_end != psz_parse &&
                     i_value != LONG_MAX && i_value != LONG_MIN )
                 {
                     i_program = i_value;
@@ -281,24 +287,32 @@ static int ParseLine( char *psz_line, char **ppsz_name,
         /* This isn't a valid channels file, cleanup everything */
         while( (*pi_options)-- ) free( (*pppsz_options)[*pi_options] );
         free( *pppsz_options );
-        *pppsz_options = 0; *pi_options = 0;
+        *pppsz_options = NULL; *pi_options = 0;
     }
 
     if( i_program && pppsz_options && pi_options )
     {
         char *psz_option;
 
-        asprintf( &psz_option, "program=%i", i_program );
-        INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
-                     psz_option );
+        if( asprintf( &psz_option, "program=%i", i_program ) != -1 )
+            INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
+                         psz_option );
     }
     if( i_frequency && pppsz_options && pi_options )
     {
         char *psz_option;
 
-        asprintf( &psz_option, "dvb-frequency=%i", i_frequency );
-        INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
-                     psz_option );
+        if( asprintf( &psz_option, "dvb-frequency=%i", i_frequency ) != -1 )
+            INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
+                         psz_option );
+    }
+    if( i_symbolrate && pppsz_options && pi_options )
+    {
+        char *psz_option;
+
+        if( asprintf( &psz_option, "dvb-srate=%i", i_symbolrate ) != -1 )
+            INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
+                         psz_option );
     }
     if( ppsz_name && psz_name ) *ppsz_name = strdup( psz_name );