From: Rocky B. <ro...@us...> - 2003-08-25 10:04:22
|
Update of /cvsroot/xine/xine-vcdnav/input In directory sc8-pr-cvs1:/tmp/cvs-serv8643/input Modified Files: vcdplayer.c Log Message: Routine-name changes from vcdimager-cdio. Index: vcdplayer.c =================================================================== RCS file: /cvsroot/xine/xine-vcdnav/input/vcdplayer.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- vcdplayer.c 23 Aug 2003 03:39:52 -0000 1.77 +++ vcdplayer.c 24 Aug 2003 10:25:36 -0000 1.78 @@ -276,7 +276,8 @@ if (off_t != NULL) { *entry = off_t->lid; dbg_print(INPUT_DBG_PBC, "%s: %d\n", label, off_t->lid); - } + } else + *entry = VCDINFO_INVALID_ENTRY; } } @@ -301,27 +302,28 @@ case PSD_TYPE_SELECTION_LIST: case PSD_TYPE_EXT_SELECTION_LIST: if (this->pxd.psd == NULL) return; - _vcdplayer_update_entry(obj, vcdinf_psd_get_prev(this->pxd.psd), + _vcdplayer_update_entry(obj, vcdinf_psd_get_prev_offset(this->pxd.psd), &(this->prev_entry), "prev"); - _vcdplayer_update_entry(obj, vcdinf_psd_get_next(this->pxd.psd), + _vcdplayer_update_entry(obj, vcdinf_psd_get_next_offset(this->pxd.psd), &(this->next_entry), "next"); - _vcdplayer_update_entry(obj, vcdinf_psd_get_return(this->pxd.psd), + _vcdplayer_update_entry(obj, vcdinf_psd_get_return_offset(this->pxd.psd), &(this->return_entry), "return"); - _vcdplayer_update_entry(obj, vcdinfo_get_default(obj, this->cur_lid), + _vcdplayer_update_entry(obj, + vcdinfo_get_default_offset(obj, this->cur_lid), &(this->default_entry), "default"); break; case PSD_TYPE_PLAY_LIST: if (this->pxd.pld == NULL) return; - _vcdplayer_update_entry(obj, vcdinf_pld_get_prev(this->pxd.pld), + _vcdplayer_update_entry(obj, vcdinf_pld_get_prev_offset(this->pxd.pld), &(this->prev_entry), "prev"); - _vcdplayer_update_entry(obj, vcdinf_pld_get_next(this->pxd.pld), + _vcdplayer_update_entry(obj, vcdinf_pld_get_next_offset(this->pxd.pld), &(this->next_entry), "next"); - _vcdplayer_update_entry(obj, vcdinf_pld_get_return(this->pxd.pld), + _vcdplayer_update_entry(obj, vcdinf_pld_get_return_offset(this->pxd.pld), &(this->return_entry), "return"); this->default_entry = VCDINFO_INVALID_ENTRY; break; @@ -746,11 +748,11 @@ case PSD_TYPE_SELECTION_LIST: /* Selection List (+Ext. for SVCD) */ case PSD_TYPE_EXT_SELECTION_LIST: /* Extended Selection List (VCD2.0) */ { - int wait_time = vcdinf_get_timeout_time(this->pxd.psd); - int timeout_LID = vcdinf_get_timeout_LID(this->pxd.psd); - uint16_t max_loop = vcdinf_get_loop_count(this->pxd.psd); + int wait_time = vcdinf_get_timeout_time(this->pxd.psd); + uint16_t timeout_offs = vcdinf_get_timeout_offset(this->pxd.psd); + uint16_t max_loop = vcdinf_get_loop_count(this->pxd.psd); vcdinfo_offset_t *offset_timeout_LID = - vcdinfo_get_offset_t(this->vcd, timeout_LID); + vcdinfo_get_offset_t(this->vcd, timeout_offs); dbg_print(INPUT_DBG_PBC, "wait_time: %d, looped: %d, max_loop %d\n", wait_time, this->loop_count, max_loop); |