Contrib: build libschro / liboil by default for OSX.

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

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index cc4d90511bf225c2a2d77bb30cee31d0c347c6c4..8145fd3cdbb80af2fde977c1993fdd84e1012105 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -24,10 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
-#include "charset.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
+#include <vlc_charset.h>
 
 #include "playlist.h"
 
@@ -47,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;
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int     i_peek;
-    vlc_bool_t b_valid = VLC_FALSE;
+    bool b_valid = false;
 
-    if( !isExtension( 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 */
@@ -70,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;
@@ -85,8 +89,9 @@ 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);
 }
 
 /*****************************************************************************
@@ -95,11 +100,11 @@ void E_(Close_DVB)( vlc_object_t *p_this )
 static int Demux( demux_t *p_demux )
 {
     char       *psz_line;
+    input_item_t *p_input;
     INIT_PLAYLIST_STUFF;
 
     while( (psz_line = stream_ReadLine( p_demux->s )) )
     {
-        playlist_item_t *p_item;
         char **ppsz_options = NULL;
         int  i, i_options = 0;
         char *psz_name = NULL;
@@ -112,31 +117,28 @@ 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_ItemNewExt( p_demux, "dvb://", psz_name, 0, NULL, -1 );
         for( i = 0; i< i_options; i++ )
         {
             EnsureUTF8( ppsz_options[i] );
-            vlc_input_item_AddOption( p_input, ppsz_options[i] );
+            input_ItemAddOption( p_input, ppsz_options[i] );
         }
-        playlist_AddWhereverNeeded( p_playlist, p_input, p_current, 
-                                    p_item_in_category,
-                                    (i_parent_id > 0 ) ? VLC_TRUE: VLC_FALSE,
-                                    PLAYLIST_APPEND );
-
+        input_ItemAddSubItem( p_current_input, p_input );
+        vlc_gc_decref( p_input );
         while( i_options-- ) free( ppsz_options[i_options] );
-        if( ppsz_options ) free( ppsz_options );
+        free( ppsz_options );
 
         free( psz_line );
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return VLC_SUCCESS;
+    return 0; /* Needed for correct operation of go back */
 }
 
 static struct
 {
-    char *psz_name;
-    char *psz_option;
+    const char *psz_name;
+    const char *psz_option;
 
 } dvb_options[] =
 {
@@ -178,6 +180,8 @@ static struct
     { "QAM_64", "dvb-modulation=64" },
     { "QAM_128", "dvb-modulation=128" },
     { "QAM_256", "dvb-modulation=256" },
+    { "8VSB", "dvb-modulation=8"  },
+    { "16VSB", "dvb-modulation=16"  },
 
     { "TRANSMISSION_MODE_AUTO", "dvb-transmission=0" },
     { "TRANSMISSION_MODE_2K", "dvb-transmission=2" },
@@ -191,7 +195,7 @@ static int ParseLine( char *psz_line, char **ppsz_name,
 {
     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;
+    bool b_valid = false;
 
     if( pppsz_options ) *pppsz_options = 0;
     if( pi_options ) *pi_options = 0;
@@ -202,11 +206,11 @@ static int ParseLine( char *psz_line, char **ppsz_name,
            *psz_parse == '\n' || *psz_parse == '\r' ) psz_parse++;
 
     /* Ignore comments */
-    if( *psz_parse == '#' ) return VLC_FALSE;
+    if( *psz_parse == '#' ) return false;
 
     while( psz_parse )
     {
-        char *psz_option = 0;
+        const char *psz_option = 0;
         char *psz_end = strchr( psz_parse, ':' );
         if( psz_end ) { *psz_end = 0; psz_end++; }
 
@@ -240,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;
                 }
             }
@@ -262,9 +266,10 @@ static int ParseLine( char *psz_line, char **ppsz_name,
 
         if( psz_option && pppsz_options && pi_options )
         {
-            psz_option = strdup( psz_option );
-            INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
-                         psz_option );
+            char *psz_dup = strdup( psz_option );
+            if (psz_dup != NULL)
+                INSERT_ELEM( *pppsz_options, (*pi_options), (*pi_options),
+                             psz_dup );
         }
 
         psz_parse = psz_end;
@@ -275,7 +280,7 @@ 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] );
-        if( *pppsz_options ) free( *pppsz_options );
+        free( *pppsz_options );
         *pppsz_options = 0; *pi_options = 0;
     }
 
@@ -302,5 +307,6 @@ static int ParseLine( char *psz_line, char **ppsz_name,
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
     return VLC_EGENERIC;
 }