DTV: add dvbt shortcut, for old-BDA module compatibility

[vlc] / modules / access / dvdread.c

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 76b94a8cb376f7ff4dcaa857d250706da3eb4de6..d56527937f96c36a5019c173b0299b1979cb5f8f 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -63,11 +63,6 @@
 #define ANGLE_LONGTEXT N_( \
     "Default DVD angle." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DVDs. " \
-    "This value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -78,8 +73,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
     add_integer( "dvdread-angle", 1, ANGLE_TEXT,
         ANGLE_LONGTEXT, false )
-    add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */
     set_capability( "access_demux", 0 )
     add_shortcut( "dvd", "dvdread", "dvdsimple" )
@@ -178,7 +171,7 @@ static int Open( vlc_object_t *p_this )
     else
         psz_file = strdup( p_demux->psz_file );
 
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
     if( psz_file != NULL )
     {
         size_t flen = strlen( psz_file );
@@ -244,10 +237,6 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    /* Update default_pts to a suitable value for dvdread access */
-    var_Create( p_demux, "dvdread-caching",
-                VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 }
 
@@ -430,7 +419,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "dvdread-caching" )*1000;
+            *pi64 =
+                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
             return VLC_SUCCESS;
 
         /* TODO implement others */
@@ -670,6 +660,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
     }
     else if( tk->fmt.i_cat == AUDIO_ES )
     {
+#if 0
         int i_audio = -1;
         /* find the audio number PLEASE find another way */
         if( (i_id&0xbdf8) == 0xbd88 )       /* dts */
@@ -688,6 +679,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
         {
             i_audio = i_id&0x1f;
         }
+#endif
 
         if( psz_language[0] ) tk->fmt.psz_language = strdup( psz_language );
     }