[vlc-commits] vcdx: work around stupid type mismatch
Rémi Denis-Courmont
git at videolan.org
Mon Jul 22 18:02:38 CEST 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 22 19:02:03 2013 +0300| [4658c81db6d9f0526f29a6d1617c2c011360624c] | committer: Rémi Denis-Courmont
vcdx: work around stupid type mismatch
Don't ask me why the original developer needed to use mismatched type
names here.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4658c81db6d9f0526f29a6d1617c2c011360624c
---
modules/access/vcdx/access.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index a42dc71..ba114ef 100644
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -675,16 +675,16 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
p_access->info.i_title = i_track-1;
if (p_vcdplayer->b_track_length)
{
- p_access->p_sys->size = p_vcdplayer->p_title[i_track-1]->i_size;
+ p_vcdplayer->size = p_vcdplayer->p_title[i_track-1]->i_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->p_sys->size = M2F2_SECTOR_SIZE * (int64_t)
+ p_vcdplayer->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: %"PRIu64", pos: %"PRIu64,
- p_access->p_sys->size, p_access->info.i_pos );
+ p_vcdplayer->size, p_access->info.i_pos );
p_access->info.i_seekpoint = p_itemid->num;
break;
@@ -696,7 +696,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
the entry seekpoints and (zeroed) lid seekpoints.
*/
p_access->info.i_title = p_vcdplayer->i_titles - 1;
- p_access->p_sys->size = 0; /* No seeking on stills, please. */
+ p_vcdplayer->size = 0; /* No seeking on stills, please. */
p_access->info.i_pos = 0;
p_access->info.i_seekpoint = p_vcdplayer->i_entries
+ p_vcdplayer->i_lids + p_itemid->num;
@@ -704,7 +704,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
case VCDINFO_ITEM_TYPE_TRACK:
p_access->info.i_title = i_track-1;
- p_access->p_sys->size = p_vcdplayer->p_title[i_track-1]->i_size;
+ p_vcdplayer->size = p_vcdplayer->p_title[i_track-1]->i_size;
p_access->info.i_pos = 0;
p_access->info.i_seekpoint = vcdinfo_track_get_entry(p_vcdplayer->vcd,
i_track);
@@ -865,7 +865,7 @@ VCDOpen ( vlc_object_t *p_this )
p_vcdplayer->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" );
p_access->p_sys = (access_sys_t *) p_vcdplayer;
- p_access->p_sys->size = 0;
+ p_vcdplayer->size = 0;
/* Set where to log errors messages from libcdio. */
p_vcd_access = p_access;
More information about the vlc-commits
mailing list