Change demux2 capability values so the lua demux2 gets called as a last resort (2...

[vlc] / modules / demux / cdg.c

diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index de685a519231462312ad264381aa71163e67d7cf..b67af9bd9959ab85f2c7c06c79196769f793b42e 100644 (file)
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -40,7 +40,7 @@ vlc_module_begin();
     set_description( _("CDG demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 2 );
+    set_capability( "demux2", 3 );
     set_callbacks( Open, Close );
     add_shortcut( "cdg" );
     add_shortcut( "subtitle" );
@@ -73,7 +73,7 @@ static int Open( vlc_object_t * p_this )
 
     /* Identify cdg file by extension, as there is no simple way to
      * detect it */
-    if( !demux2_IsPathExtension( p_demux, ".cdg" ) && !p_demux->b_force )
+    if( !demux2_IsPathExtension( p_demux, ".cdg" ) && !demux2_IsForced( p_demux, "cdg" ) )
         return VLC_EGENERIC;
 
     /* CDG file size has to be multiple of CDG_FRAME_SIZE (it works even
@@ -144,17 +144,8 @@ static void Close ( vlc_object_t * p_this )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    demux_sys_t *p_sys  = p_demux->p_sys;
-    int64_t *pi64;
-
     switch( i_query )
     {
-#if 0
-    case DEMUX_GET_TIME:
-        pi64 = (int64_t*)va_arg( args, int64_t * );
-        *pi64 = date_Get( &p_sys->pts );
-        return VLC_SUCCESS;
-#endif
     default:
         return demux2_vaControlHelper( p_demux->s, 0, -1,
                                        8*CDG_FRAME_SIZE*CDG_FRAME_RATE, CDG_FRAME_SIZE, i_query, args );