X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fvcdx%2Faccess.c;h=f6bb46c5595746f17422effe9e9a465eb86f4666;hb=2e847d8484163b50d8fe98350f3dc96ac8a1a43f;hp=b122c7ea91e4942b14179bd412855833d53398f1;hpb=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c index b122c7ea91..f6bb46c559 100644 --- a/modules/access/vcdx/access.c +++ b/modules/access/vcdx/access.c @@ -146,8 +146,6 @@ VCDReadBlock( access_t * p_access ) int i_read; uint8_t *p_buf; - i_read = 0; - dbg_print( (INPUT_DBG_LSN), "lsn: %lu", (long unsigned int) p_vcdplayer->i_lsn ); @@ -222,7 +220,7 @@ VCDReadBlock( access_t * p_access ) if ( p_vcdplayer->i_lsn >= i_lsn && i_lsn != VCDINFO_NULL_LSN ) { dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC), - "entry change to %d, current LSN %u >= end %u", + "entry change to %zu, current LSN %u >= end %u", i_entry, p_vcdplayer->i_lsn, i_lsn); p_vcdplayer->play_item.num = i_entry; @@ -241,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; { @@ -252,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) @@ -288,7 +286,7 @@ VCDSeek( access_t * p_access, int64_t i_pos ) } dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK), - "orig %lu, cur: %lu, offset: %lld, entry %d", + "orig %lu, cur: %lu, offset: %"PRIi64", entry %d", (long unsigned int) p_vcdplayer->origin_lsn, (long unsigned int) p_vcdplayer->i_lsn, i_pos, i_entry ); @@ -464,7 +462,7 @@ VCDTitles( access_t * p_access ) i ) * M2F2_SECTOR_SIZE / CDIO_CD_FRAMESIZE ; t->psz_name = strdup(psz_track); - dbg_print( INPUT_DBG_MRL, "track[%d] i_size: %lld", i, t->i_size ); + dbg_print( INPUT_DBG_MRL, "track[%d] i_size: %"PRIi64, i, t->i_size ); p_vcdplayer->i_titles++; } @@ -548,7 +546,7 @@ VCDParse( access_t * p_access, /*out*/ vcdinfo_itemid_t * p_itemid, char *psz_source; char *psz_next; - if( config_GetInt( p_access, MODULE_STRING "-PBC" ) ) { + if( var_InheritInteger( p_access, MODULE_STRING "-PBC" ) ) { p_itemid->type = VCDINFO_ITEM_TYPE_LID; p_itemid->num = 1; *play_single_item = false; @@ -630,11 +628,10 @@ VCDParse( access_t * p_access, /*out*/ vcdinfo_itemid_t * p_itemid, /* No source specified, so figure it out. */ if( !p_access->psz_access ) return NULL; - psz_source = config_GetPsz( p_access, "vcd" ); + psz_source = var_InheritString( p_access, "vcd" ); - if( !psz_source || 0==strlen(psz_source) ) + if( !psz_source ) { - free( psz_source ); /* Scan for a CD-ROM drive with a VCD in it. */ char **cd_drives = cdio_get_devices_with_cap(NULL, (CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD @@ -681,14 +678,14 @@ 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) vcdinfo_get_entry_sect_count(p_vcdplayer->vcd,p_itemid->num); p_access->info.i_pos = 0; } - dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC), "size: %llu, pos: %llu", + dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC), "size: %"PRIu64", pos: %"PRIu64, p_access->info.i_size, p_access->info.i_pos ); p_access->info.i_seekpoint = p_itemid->num; break; @@ -870,7 +867,7 @@ VCDOpen ( vlc_object_t *p_this ) if( p_vcdplayer == NULL ) return VLC_ENOMEM; - p_vcdplayer->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" ); + p_vcdplayer->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" ); p_access->p_sys = (access_sys_t *) p_vcdplayer; /* Set where to log errors messages from libcdio. */ @@ -890,15 +887,13 @@ VCDOpen ( vlc_object_t *p_this ) psz_source, p_access->psz_path ); p_vcdplayer->psz_source = strdup(psz_source); - p_vcdplayer->i_blocks_per_read = config_GetInt( p_this, MODULE_STRING + p_vcdplayer->i_blocks_per_read = var_InheritInteger( p_this, MODULE_STRING "-blocks-per-read" ); - p_vcdplayer->b_track_length = config_GetInt( p_this, MODULE_STRING + p_vcdplayer->b_track_length = var_InheritInteger( p_this, MODULE_STRING "-track-length" ); p_vcdplayer->in_still = false; p_vcdplayer->play_item.type = VCDINFO_ITEM_TYPE_NOTFOUND; - p_vcdplayer->p_input = vlc_object_find( p_access, - VLC_OBJECT_INPUT, - FIND_PARENT ); + p_vcdplayer->p_input = access_GetParentInput( p_access ); // p_vcdplayer->p_meta = vlc_meta_New(); p_vcdplayer->p_segments = NULL; p_vcdplayer->p_entries = NULL; @@ -910,7 +905,7 @@ VCDOpen ( vlc_object_t *p_this ) goto err_exit; } - p_vcdplayer->b_svd= (bool) vcdinfo_get_tracksSVD(p_vcdplayer->vcd);; + p_vcdplayer->b_svd = vcdinfo_get_tracksSVD(p_vcdplayer->vcd); /* Get track information. */ p_vcdplayer->i_tracks = vcdinfo_get_num_tracks(p_vcdplayer->vcd);