Qt: make SeekPoints handle jump to chapter requests

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

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 67598d0bd5595bdf30d9e7f25ed53878e197cf32..a13430e95b2b01e544051b6b70239d6895c23eaf 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;
@@ -239,7 +239,7 @@ VCDReadBlock( access_t * p_access )
  * VCDSeek
  ****************************************************************************/
 int
-VCDSeek( access_t * p_access, int64_t i_pos )
+VCDSeek( access_t * p_access, uint64_t i_pos )
 {
     if (!p_access || !p_access->p_sys) return VLC_EGENERIC;
     {
@@ -250,7 +250,7 @@ VCDSeek( access_t * p_access, int64_t i_pos )
 
         /* Next sector to read */
         p_access->info.i_pos = i_pos;
-        p_vcdplayer->i_lsn = (i_pos / (int64_t) M2F2_SECTOR_SIZE) +
+        p_vcdplayer->i_lsn = (i_pos / (uint64_t) M2F2_SECTOR_SIZE) +
                              p_vcdplayer->origin_lsn;
 
         switch (p_vcdplayer->play_item.type)
@@ -361,9 +361,9 @@ VCDEntryPoints( access_t * p_access )
                              - vcdinfo_get_track_lsn(p_vcdplayer->vcd,i_track))
                              * M2F2_SECTOR_SIZE;
     
-            dbg_print( INPUT_DBG_MRL, "%s, lsn %d,  byte_offset %ld",
+            dbg_print( INPUT_DBG_MRL, "%s, lsn %d,  byte_offset %"PRId64"",
                        s->psz_name, p_vcdplayer->p_entries[i],
-                       (unsigned long int) s->i_byte_offset);
+                       s->i_byte_offset);
             TAB_APPEND( p_vcdplayer->p_title[i_track-1]->i_seekpoint,
                         p_vcdplayer->p_title[i_track-1]->seekpoint, s );
 
@@ -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]] */
@@ -678,7 +678,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
         if (p_vcdplayer->b_track_length)
         {
             p_access->info.i_size = p_vcdplayer->p_title[i_track-1]->i_size;
-            p_access->info.i_pos  = (int64_t) M2F2_SECTOR_SIZE *
+            p_access->info.i_pos  = (uint64_t) M2F2_SECTOR_SIZE *
                      (vcdinfo_get_track_lsn(p_vcdplayer->vcd, i_track)-i_lsn);
         } else {
             p_access->info.i_size = M2F2_SECTOR_SIZE * (int64_t)
@@ -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;