Separate string list and string list callback

[vlc] / modules / access / dvdread.c

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index a9621576cb1a7ef7f46fdf6b9bf2370a965aea43..d0c2bff2ffd1e7461ec87a594dd48294ff8a81c5 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 * );
 
@@ -76,10 +71,8 @@ vlc_module_begin ()
     set_description( N_("DVDRead Input (no menu support)") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
+    add_integer( "dvdread-angle", 1, ANGLE_TEXT,
         ANGLE_LONGTEXT, false )
-    add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-        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" )
@@ -147,7 +140,7 @@ struct demux_sys_t
 
 static int Control   ( demux_t *, int, va_list );
 static int Demux     ( demux_t * );
-static int DemuxBlock( demux_t *, uint8_t *, int );
+static int DemuxBlock( demux_t *, const uint8_t *, int );
 
 static void DemuxTitles( demux_t *, int * );
 static void ESNew( demux_t *, int, int );
@@ -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 );
@@ -238,16 +231,12 @@ static int Open( vlc_object_t *p_this )
     DemuxTitles( p_demux, &p_sys->i_angle );
     if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS )
     {
-        Close( p_this );
         msg_Err( p_demux, "DvdReadSetArea(0,0,%i) failed (can't decrypt DVD?)",
                  p_sys->i_angle );
+        Close( 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 */
@@ -554,22 +544,20 @@ static int Demux( demux_t *p_demux )
 /*****************************************************************************
  * DemuxBlock: demux a given block
  *****************************************************************************/
-static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt )
+static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    uint8_t     *p = pkt;
 
-    while( p < &pkt[i_pkt] )
+    while( len > 0 )
     {
-        int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
-        block_t *p_pkt;
-        if( i_size <= 0 )
+        int i_size = ps_pkt_size( p, len );
+        if( i_size <= 0 || i_size > len )
         {
             break;
         }
 
         /* Create a block */
-        p_pkt = block_New( p_demux, i_size );
+        block_t *p_pkt = block_New( p_demux, i_size );
         memcpy( p_pkt->p_buffer, p, i_size);
 
         /* Parse it and send it */
@@ -634,6 +622,7 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt )
         }
 
         p += i_size;
+        len -= i_size;
     }
 
     return VLC_SUCCESS;
@@ -671,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 */
@@ -689,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 );
     }