Update LGPL license blurb, choosing v2.1+.

[vlc] / modules / access / vcdx / access.c

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index f6bb46c5595746f17422effe9e9a465eb86f4666..0982ad4a915d5050dfd465608211578ee684031c 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -193,7 +193,7 @@ VCDReadBlock( access_t * p_access )
              Until then...
            */
 #if 1
-            msleep( MILLISECONDS_PER_SEC * *p_buf );
+            msleep( INT64_C(1000) * *p_buf );
             VCDSetOrigin(p_access, p_vcdplayer->origin_lsn,
                          p_vcdplayer->i_track, &(p_vcdplayer->play_item));
             // p_vcd->in_still = false;
@@ -546,7 +546,7 @@ VCDParse( access_t * p_access, /*out*/ vcdinfo_itemid_t * p_itemid,
     char        *psz_source;
     char        *psz_next;
 
-    if( var_InheritInteger( p_access, MODULE_STRING "-PBC" ) ) {
+    if( var_InheritBool( p_access, MODULE_STRING "-PBC" ) ) {
       p_itemid->type = VCDINFO_ITEM_TYPE_LID;
       p_itemid->num = 1;
       *play_single_item = false;
@@ -563,12 +563,12 @@ VCDParse( access_t * p_access, /*out*/ vcdinfo_itemid_t * p_itemid,
     if( !p_access->psz_access || !*p_access->psz_access ) return NULL;
 #endif
 
-    if( !p_access->psz_path )
+    if( !p_access->psz_location )
     {
         return NULL;
     }
 
-    psz_parser = psz_source = strdup( p_access->psz_path );
+    psz_parser = psz_source = strdup( p_access->psz_location );
 
     /* Parse input string :
      * [device][@[type][title]] */
@@ -884,7 +884,7 @@ VCDOpen ( vlc_object_t *p_this )
     }
 
     dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "source: %s: mrl: %s",
-               psz_source, p_access->psz_path );
+               psz_source, p_access->psz_location );
 
     p_vcdplayer->psz_source        = strdup(psz_source);
     p_vcdplayer->i_blocks_per_read = var_InheritInteger( p_this, MODULE_STRING
@@ -1050,7 +1050,7 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
 
     /* */
     case ACCESS_GET_PTS_DELAY:
-        *(int64_t*)va_arg(args,int64_t *) = MILLISECONDS_PER_SEC *
+        *(int64_t*)va_arg(args,int64_t *) = INT64_C(1000) *
                          var_GetInteger( p_access, MODULE_STRING "-caching" );
         dbg_print( INPUT_DBG_EVENT, "GET PTS DELAY" );
         return VLC_SUCCESS;