fix #1410.

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

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index c020f5579178715fdd495398004c7d4efadbba9e..5e3edb5ce18242b44c5bba029886a316d5769a34 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -50,11 +50,11 @@ static int ParseLine( char *, char **, char ***, int *);
 int E_(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;
 
-    if( !isExtension( p_demux, ".conf" ) && !p_demux->b_force )
+    if( !demux2_IsPathExtension( p_demux, ".conf" ) && !p_demux->b_force )
         return VLC_EGENERIC;
 
     /* Check if this really is a channels file */
@@ -118,10 +118,8 @@ static int Demux( demux_t *p_demux )
             EnsureUTF8( ppsz_options[i] );
             input_ItemAddOption( p_input, ppsz_options[i] );
         }
-        playlist_BothAddInput( p_playlist, p_input, p_item_in_category,
-                               PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
-                               PLAYLIST_END, NULL, NULL );
-
+        input_ItemAddSubItem( p_current_input, p_input, VLC_FALSE );
+        vlc_gc_decref( p_input );
         while( i_options-- ) free( ppsz_options[i_options] );
         if( ppsz_options ) free( ppsz_options );
 
@@ -129,7 +127,7 @@ static int Demux( demux_t *p_demux )
     }
 
     HANDLE_PLAY_AND_RELEASE;
-    return -1; /* Needed for correct operation of go back */
+    return 0; /* Needed for correct operation of go back */
 }
 
 static struct
@@ -177,6 +175,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" },