* vcdplayer.c : VCD input module for vlc
* using libcdio, libvcd and libvcdinfo
*****************************************************************************
- * Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
- * $Id: vcdplayer.c,v 1.10 2003/12/20 15:25:32 rocky Exp $
+ * Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+ * $Id$
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <cdio/util.h>
#include <libvcd/info.h>
+#ifdef WIN32
+#define sleep(A) Sleep((A)*1000)
+#endif
+
+extern void VCDSetOrigin ( access_t *p_access, lsn_t i_lsn, track_t i_track,
+ const vcdinfo_itemid_t * p_itemid );
+
/*!
- Return true if playback control (PBC) is on
+ Return VLC_TRUE if playback control (PBC) is on
*/
-bool
-vcdplayer_pbc_is_on(const thread_vcd_data_t *p_vcd)
+vlc_bool_t
+vcdplayer_pbc_is_on( const vcdplayer_t *p_vcd )
{
- return VCDINFO_INVALID_ENTRY != p_vcd->cur_lid;
+ return VCDINFO_INVALID_ENTRY != p_vcd->i_lid;
}
-static void
-vcdplayer_update_entry( input_thread_t * p_input, uint16_t ofs,
+/* Given an itemid, return the size for the object (via information
+ previously stored when opening the vcd). */
+static size_t
+vcdplayer_get_item_size(access_t * p_access, vcdinfo_itemid_t itemid)
+{
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
+
+ switch (itemid.type) {
+ case VCDINFO_ITEM_TYPE_ENTRY:
+ return p_vcd->entry[itemid.num].size;
+ break;
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+ return p_vcd->segment[itemid.num].size;
+ break;
+ case VCDINFO_ITEM_TYPE_TRACK:
+ return p_vcd->track[itemid.num-1].size;
+ break;
+ case VCDINFO_ITEM_TYPE_LID:
+ /* Play list number (LID) */
+ return 0;
+ break;
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+ case VCDINFO_ITEM_TYPE_SPAREID2:
+ default:
+ LOG_ERR("%s %d", _("bad item type"), itemid.type);
+ return 0;
+ }
+}
+
+static void
+vcdplayer_update_entry( access_t * p_access, uint16_t ofs,
uint16_t *entry, const char *label)
{
- thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
if ( ofs == VCDINFO_INVALID_OFFSET ) {
*entry = VCDINFO_INVALID_ENTRY;
} else {
- vcdinfo_offset_t *off_t = vcdinfo_get_offset_t(p_vcd->vcd, ofs);
- if (off_t != NULL) {
- *entry = off_t->lid;
- dbg_print(INPUT_DBG_PBC, "%s: LID %d\n", label, off_t->lid);
+ vcdinfo_offset_t *off = vcdinfo_get_offset_t(p_vcd->vcd, ofs);
+ if (off != NULL) {
+ *entry = off->lid;
+ dbg_print(INPUT_DBG_PBC, "%s: LID %d", label, off->lid);
} else
*entry = VCDINFO_INVALID_ENTRY;
}
The navigations rules here may be sort of made up, but the intent
is to do something that's probably right or helpful.
- return true if the caller should return.
+ return VLC_TRUE if the caller should return.
*/
-vcdplayer_read_status_t
-vcdplayer_non_pbc_nav ( input_thread_t * p_input )
+vcdplayer_read_status_t
+vcdplayer_non_pbc_nav ( access_t *p_access )
{
- thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
/* Not in playback control. Do we advance automatically or stop? */
switch (p_vcd->play_item.type) {
case VCDINFO_ITEM_TYPE_TRACK:
case VCDINFO_ITEM_TYPE_ENTRY: {
-
- dbg_print( INPUT_DBG_LSN, "new track %d, lsn %d", p_vcd->cur_track,
- p_vcd->p_sectors[p_vcd->cur_track+1] );
- return READ_END;
+ if ( ! vcdplayer_play_next( p_access ) )
+ {
+ return READ_END;
+ }
break;
}
case VCDINFO_ITEM_TYPE_SPAREID2:
dbg_print( (INPUT_DBG_STILL|INPUT_DBG_LSN),
"SPAREID2" );
/* FIXME */
- p_input->stream.b_seekable = 0;
if (p_vcd->in_still)
{
return READ_STILL_FRAME ;
case VCDINFO_ITEM_TYPE_SEGMENT:
/* Hack: Just go back and do still again */
/* FIXME */
- p_input->stream.b_seekable = 0;
if (p_vcd->in_still)
{
dbg_print( (INPUT_DBG_STILL|INPUT_DBG_LSN),
return READ_BLOCK;
}
+/*!
+ Set reading to play an entire track.
+*/
+static void
+_vcdplayer_set_track(access_t * p_access, track_t i_track)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ if (i_track < 1 || i_track > p_vcd->i_tracks)
+ return;
+ else {
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+ vcdinfo_itemid_t itemid;
+
+ itemid.num = i_track;
+ itemid.type = VCDINFO_ITEM_TYPE_TRACK;
+ p_vcd->in_still = 0;
+
+ VCDSetOrigin(p_access, vcdinfo_get_track_lsn(p_obj, i_track),
+ i_track, &itemid);
+
+ dbg_print(INPUT_DBG_LSN, "LSN: %u", p_vcd->i_lsn);
+ }
+}
+
+/*!
+ Set reading to play an entry
+*/
+static void
+_vcdplayer_set_entry(access_t * p_access, unsigned int num)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+ unsigned int num_entries = vcdinfo_get_num_entries(p_obj);
+
+ if (num >= num_entries) {
+ LOG_ERR("%s %d", _("bad entry number"), num);
+ return;
+ } else {
+ vcdinfo_itemid_t itemid;
+
+ itemid.num = num;
+ itemid.type = VCDINFO_ITEM_TYPE_ENTRY;
+ p_vcd->in_still = 0;
+
+ VCDSetOrigin(p_access, vcdinfo_get_entry_lba(p_obj, num),
+ vcdinfo_get_track(p_obj, num), &itemid);
+
+ dbg_print(INPUT_DBG_LSN, "LSN: %u, track_end LSN: %u",
+ p_vcd->i_lsn, p_vcd->track_end_lsn);
+ }
+}
+
+/*!
+ Set reading to play an segment (e.g. still frame)
+*/
+static void
+_vcdplayer_set_segment(access_t * p_access, unsigned int num)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+ segnum_t num_segs = vcdinfo_get_num_segments(p_obj);
+
+ if (num >= num_segs) {
+ LOG_ERR("%s %d", _("bad segment number"), num);
+ return;
+ } else {
+ vcdinfo_itemid_t itemid;
+
+ if (VCDINFO_NULL_LSN==p_vcd->i_lsn) {
+ LOG_ERR("%s %d",
+ _("Error in getting current segment number"), num);
+ return;
+ }
+
+ itemid.num = num;
+ itemid.type = VCDINFO_ITEM_TYPE_SEGMENT;
+
+ VCDSetOrigin(p_access, vcdinfo_get_seg_lsn(p_obj, num), 0, &itemid);
+
+ dbg_print(INPUT_DBG_LSN, "LSN: %u", p_vcd->i_lsn);
+ }
+}
+
+/* Play entry. */
+/* Play a single item. */
+static void
+vcdplayer_play_single_item( access_t * p_access, vcdinfo_itemid_t itemid)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+
+ dbg_print(INPUT_DBG_CALL, "called itemid.num: %d, itemid.type: %d",
+ itemid.num, itemid.type);
+
+ p_vcd->in_still = 0;
+
+ switch (itemid.type) {
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+ {
+ vcdinfo_video_segment_type_t segtype
+ = vcdinfo_get_video_type(p_obj, itemid.num);
+ segnum_t num_segs = vcdinfo_get_num_segments(p_obj);
+
+ dbg_print(INPUT_DBG_PBC, "%s (%d), itemid.num: %d",
+ vcdinfo_video_type2str(p_obj, itemid.num),
+ (int) segtype, itemid.num);
+
+ if (itemid.num >= num_segs) return;
+ _vcdplayer_set_segment(p_access, itemid.num);
+
+ switch (segtype)
+ {
+ case VCDINFO_FILES_VIDEO_NTSC_STILL:
+ case VCDINFO_FILES_VIDEO_NTSC_STILL2:
+ case VCDINFO_FILES_VIDEO_PAL_STILL:
+ case VCDINFO_FILES_VIDEO_PAL_STILL2:
+ p_vcd->in_still = -5;
+ break;
+ default:
+ p_vcd->in_still = 0;
+ }
+
+ break;
+ }
+
+ case VCDINFO_ITEM_TYPE_TRACK:
+ dbg_print(INPUT_DBG_PBC, "track %d", itemid.num);
+ if (itemid.num < 1 || itemid.num > p_vcd->i_tracks) return;
+ _vcdplayer_set_track(p_access, itemid.num);
+ break;
+
+ case VCDINFO_ITEM_TYPE_ENTRY:
+ {
+ unsigned int num_entries = vcdinfo_get_num_entries(p_obj);
+ dbg_print(INPUT_DBG_PBC, "entry %d", itemid.num);
+ if (itemid.num >= num_entries) return;
+ _vcdplayer_set_entry(p_access, itemid.num);
+ break;
+ }
+
+ case VCDINFO_ITEM_TYPE_LID:
+ LOG_ERR("%s", _("Should have converted p_vcd above"));
+ break;
+
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+ dbg_print(INPUT_DBG_PBC, "play nothing");
+ p_vcd->i_lsn = p_vcd->end_lsn;
+ return;
+
+ default:
+ LOG_ERR("item type %d not implemented.", itemid.type);
+ return;
+ }
+
+ p_vcd->play_item = itemid;
+
+ /* Some players like xine, have a fifo queue of audio and video buffers
+ that need to be flushed when playing a new selection. */
+ /* if (p_vcd->flush_buffers)
+ p_vcd->flush_buffers(); */
+}
+
+/*
+ Set's start origin and size for subsequent seeks.
+ input: p_vcd->i_lsn, p_vcd->play_item
+ changed: p_vcd->origin_lsn, p_vcd->end_lsn
+*/
+
+/* FIXME: add parameters lsn, i_track, p_itemid and set accordingly. */
+void
+vcdplayer_set_origin(access_t *p_access, lsn_t i_lsn, track_t i_track,
+ const vcdinfo_itemid_t *p_itemid)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ const size_t i_size= vcdplayer_get_item_size(p_access, *p_itemid);
+
+ p_vcd->play_item.num = p_itemid->num;
+ p_vcd->play_item.type = p_itemid->type;
+ p_vcd->i_lsn = i_lsn;
+ p_vcd->end_lsn = p_vcd->i_lsn + i_size;
+ p_vcd->origin_lsn = p_vcd->i_lsn;
+ p_vcd->i_track = i_track;
+ p_vcd->track_lsn = vcdinfo_get_track_lba(p_vcd->vcd, i_track);
+
+ dbg_print((INPUT_DBG_CALL|INPUT_DBG_LSN),
+ "lsn %u, end LSN: %u item.num %d, item.type %d",
+ p_vcd->i_lsn, p_vcd->end_lsn,
+ p_vcd->play_item.num, p_vcd->play_item.type);
+}
+
+/*
+ Get the next play-item in the list given in the LIDs. Note play-item
+ here refers to list of play-items for a single LID It shouldn't be
+ confused with a user's list of favorite things to play or the
+ "next" field of a LID which moves us to a different LID.
+ */
+static bool
+_vcdplayer_inc_play_item(access_t *p_access)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+ int noi;
+
+ dbg_print(INPUT_DBG_CALL, "called pli: %d", p_vcd->pdi);
+
+ if ( NULL == p_vcd || NULL == p_vcd->pxd.pld ) return false;
+
+ noi = vcdinf_pld_get_noi(p_vcd->pxd.pld);
+
+ if ( noi <= 0 ) return false;
+
+ /* Handle delays like autowait or wait here? */
+
+ p_vcd->pdi++;
+
+ if ( p_vcd->pdi < 0 || p_vcd->pdi >= noi ) return false;
+
+ else {
+ uint16_t trans_itemid_num=vcdinf_pld_get_play_item(p_vcd->pxd.pld,
+ p_vcd->pdi);
+ vcdinfo_itemid_t trans_itemid;
+
+ if (VCDINFO_INVALID_ITEMID == trans_itemid_num) return false;
+
+ vcdinfo_classify_itemid(trans_itemid_num, &trans_itemid);
+ dbg_print(INPUT_DBG_PBC, " play-item[%d]: %s",
+ p_vcd->pdi, vcdinfo_pin2str (trans_itemid_num));
+ vcdplayer_play_single_item(p_access, trans_itemid);
+ return true;
+ }
+}
+
+void
+vcdplayer_play(access_t *p_access, vcdinfo_itemid_t itemid)
+{
+ vcdplayer_t *p_vcd = (vcdplayer_t *)p_access->p_sys;
+
+ dbg_print(INPUT_DBG_CALL, "called itemid.num: %d itemid.type: %d",
+ itemid.num, itemid.type);
+
+ if (!vcdplayer_pbc_is_on(p_vcd)) {
+ vcdplayer_play_single_item(p_access, itemid);
+ } else {
+ /* PBC on - Itemid.num is LID. */
+
+ vcdinfo_obj_t *obj = p_vcd->vcd;
+
+ if (obj == NULL) return;
+
+ p_vcd->i_lid = itemid.num;
+ vcdinfo_lid_get_pxd(obj, &(p_vcd->pxd), itemid.num);
+
+ switch (p_vcd->pxd.descriptor_type) {
+
+ case PSD_TYPE_SELECTION_LIST:
+ case PSD_TYPE_EXT_SELECTION_LIST: {
+ vcdinfo_itemid_t trans_itemid;
+ uint16_t trans_itemid_num;
+
+ if (p_vcd->pxd.psd == NULL) return;
+ trans_itemid_num = vcdinf_psd_get_itemid(p_vcd->pxd.psd);
+ vcdinfo_classify_itemid(trans_itemid_num, &trans_itemid);
+ p_vcd->loop_count = 1;
+ p_vcd->loop_item = trans_itemid;
+ vcdplayer_play_single_item(p_access, trans_itemid);
+ break;
+ }
+
+ case PSD_TYPE_PLAY_LIST: {
+ if (p_vcd->pxd.pld == NULL) return;
+ p_vcd->pdi = -1;
+ _vcdplayer_inc_play_item(p_access);
+ break;
+ }
+
+ case PSD_TYPE_END_LIST:
+ case PSD_TYPE_COMMAND_LIST:
+
+ default:
+ ;
+ }
+ }
+}
+
/* Handles PBC navigation when reaching the end of a play item. */
vcdplayer_read_status_t
-vcdplayer_pbc_nav ( input_thread_t * p_input )
+vcdplayer_pbc_nav ( access_t * p_access )
{
- thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
/* We are in playback control. */
vcdinfo_itemid_t itemid;
sequence (or track). */
if ( (VCDINFO_ITEM_TYPE_ENTRY == p_vcd->play_item.type) &&
- (p_vcd->cur_lsn < p_vcd->end_lsn) ) {
+ (p_vcd->i_lsn < p_vcd->end_lsn) ) {
/* Set up to just continue to the next entry */
p_vcd->play_item.num++;
dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
"continuing into next entry: %u", p_vcd->play_item.num);
- VCDPlay( p_input, p_vcd->play_item );
+ vcdplayer_play( p_access, p_vcd->play_item );
/* p_vcd->update_title(); */
return READ_BLOCK;
}
dbg_print(INPUT_DBG_PBC, "playlist wait_time: %d", wait_time);
- if (vcdplayer_inc_play_item(p_input))
+ if (vcdplayer_inc_play_item(p_access))
return READ_BLOCK;
/* Handle any wait time given. */
+#if FIXED
if (p_vcd->in_still) {
vcdIntfStillTime( p_vcd->p_intf, wait_time );
return READ_STILL_FRAME;
}
+#endif
- vcdplayer_update_entry( p_input,
+ vcdplayer_update_entry( p_access,
vcdinf_pld_get_next_offset(p_vcd->pxd.pld),
&itemid.num, "next" );
itemid.type = VCDINFO_ITEM_TYPE_LID;
- VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
break;
}
case PSD_TYPE_SELECTION_LIST: /* Selection List (+Ext. for SVCD) */
wait_time, p_vcd->loop_count, max_loop);
/* Handle any wait time given */
+#if FIXED
if (p_vcd->in_still) {
vcdIntfStillTime( p_vcd->p_intf, wait_time );
return READ_STILL_FRAME;
}
+#endif
/* Handle any looping given. */
if ( max_loop == 0 || p_vcd->loop_count < max_loop ) {
p_vcd->loop_count++;
if (p_vcd->loop_count == 0x7f) p_vcd->loop_count = 0;
- VCDSeek( p_input, 0 );
+ VCDSeek( p_access, 0 );
/* if (p_vcd->in_still) p_vcd->force_redisplay();*/
return READ_BLOCK;
}
itemid.num = offset_timeout_LID->lid;
itemid.type = VCDINFO_ITEM_TYPE_LID;
dbg_print(INPUT_DBG_PBC, "timeout to: %d", itemid.num);
- VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
return READ_BLOCK;
} else {
int num_selections = vcdinf_get_num_selections(p_vcd->pxd.psd);
int rand_selection=bsn +
(int) ((num_selections+0.0)*rand()/(RAND_MAX+1.0));
lid_t rand_lid=vcdinfo_selection_get_lid (p_vcd->vcd,
- p_vcd->cur_lid,
+ p_vcd->i_lid,
rand_selection);
itemid.num = rand_lid;
itemid.type = VCDINFO_ITEM_TYPE_LID;
dbg_print(INPUT_DBG_PBC, "random selection %d, lid: %d",
rand_selection - bsn, rand_lid);
- VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
return READ_BLOCK;
} else if (p_vcd->in_still) {
/* Hack: Just go back and do still again */
return READ_ERROR;
}
+/*!
+ Read block into p_buf and return the status back.
+
+ This routine is a bit complicated because on reaching the end of
+ a track or entry we may automatically advance to the item, or
+ interpret the next item in the playback-control list.
+*/
+vcdplayer_read_status_t
+vcdplayer_read (access_t * p_access, uint8_t *p_buf)
+{
+
+ /* p_access->handle_events (); */
+
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
+ if ( p_vcd->i_lsn >= p_vcd->end_lsn ) {
+ vcdplayer_read_status_t read_status;
+
+ /* We've run off of the end of this entry. Do we continue or stop? */
+ dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
+ "end reached, cur: %u, end: %u\n", p_vcd->i_lsn, p_vcd->end_lsn);
+
+ handle_item_continuation:
+ read_status = vcdplayer_pbc_is_on( p_vcd )
+ ? vcdplayer_pbc_nav( p_access )
+ : vcdplayer_non_pbc_nav( p_access );
+
+ if (READ_BLOCK != read_status) return read_status;
+ }
+
+ /* Read the next block.
+
+ Important note: we probably speed things up by removing "data"
+ and the memcpy to it by extending vcd_image_source_read_mode2
+ to allow a mode to do what's below in addition to its
+ "raw" and "block" mode. It also would probably improve the modularity
+ a little bit as well.
+ */
+
+ {
+ CdIo *p_img = vcdinfo_get_cd_image(p_vcd->vcd);
+ typedef struct {
+ uint8_t subheader [CDIO_CD_SUBHEADER_SIZE];
+ uint8_t data [M2F2_SECTOR_SIZE];
+ uint8_t spare [4];
+ } vcdsector_t;
+ vcdsector_t vcd_sector;
+
+ do {
+ if (cdio_read_mode2_sector(p_img, &vcd_sector, p_vcd->i_lsn, true)!=0) {
+ dbg_print(INPUT_DBG_LSN, "read error\n");
+ return READ_ERROR;
+ }
+ p_vcd->i_lsn++;
+
+ if ( p_vcd->i_lsn >= p_vcd->end_lsn ) {
+ /* We've run off of the end of p_vcd entry. Do we continue or stop? */
+ dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
+ "end reached in reading, cur: %u, end: %u\n",
+ p_vcd->i_lsn, p_vcd->end_lsn);
+ break;
+ }
+
+ /* Check header ID for a padding sector and simply discard
+ these. It is alleged that VCD's put these in to keep the
+ bitrate constant.
+ */
+ } while((vcd_sector.subheader[2]&~0x01)==0x60);
+
+ if ( p_vcd->i_lsn >= p_vcd->end_lsn )
+ /* We've run off of the end of this entry. Do we continue or stop? */
+ goto handle_item_continuation;
+
+ memcpy (p_buf, vcd_sector.data, M2F2_SECTOR_SIZE);
+ return READ_BLOCK;
+ }
+}
+
/*!
Get the next play-item in the list given in the LIDs. Note play-item
here refers to list of play-items for a single LID It shouldn't be
confused with a user's list of favorite things to play or the
"next" field of a LID which moves us to a different LID.
*/
-bool
-vcdplayer_inc_play_item( input_thread_t *p_input )
+vlc_bool_t
+vcdplayer_inc_play_item( access_t *p_access )
{
- thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
int noi;
dbg_print(INPUT_DBG_CALL, "called pli: %d", p_vcd->pdi);
- if ( NULL == p_vcd || NULL == p_vcd->pxd.pld ) return false;
+ if ( NULL == p_vcd || NULL == p_vcd->pxd.pld ) return VLC_FALSE;
noi = vcdinf_pld_get_noi(p_vcd->pxd.pld);
- if ( noi <= 0 ) return false;
+ if ( noi <= 0 ) return VLC_FALSE;
/* Handle delays like autowait or wait here? */
p_vcd->pdi++;
- if ( p_vcd->pdi < 0 || p_vcd->pdi >= noi ) return false;
+ if ( p_vcd->pdi < 0 || p_vcd->pdi >= noi ) return VLC_FALSE;
else {
uint16_t trans_itemid_num=vcdinf_pld_get_play_item(p_vcd->pxd.pld,
p_vcd->pdi);
vcdinfo_itemid_t trans_itemid;
- if (VCDINFO_INVALID_ITEMID == trans_itemid_num) return false;
+ if (VCDINFO_INVALID_ITEMID == trans_itemid_num) return VLC_FALSE;
vcdinfo_classify_itemid(trans_itemid_num, &trans_itemid);
dbg_print(INPUT_DBG_PBC, " play-item[%d]: %s",
p_vcd->pdi, vcdinfo_pin2str (trans_itemid_num));
- return VLC_SUCCESS == VCDPlay( p_input, trans_itemid );
+ vcdplayer_play( p_access, trans_itemid );
+ return VLC_SUCCESS;
}
}
/*!
Play item assocated with the "default" selection.
- Return false if there was some problem.
+ Return VLC_FALSE if there was some problem.
*/
-bool
-vcdplayer_play_default( input_thread_t * p_input )
+vlc_bool_t
+vcdplayer_play_default( access_t * p_access )
{
- thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
- vcdinfo_itemid_t itemid;
+ vcdinfo_itemid_t itemid;
+
+ if (!p_vcd) {
+ dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
+ "null p_vcd" );
+ return VLC_EGENERIC;
+ }
+
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
"current: %d" , p_vcd->play_item.num);
if (vcdplayer_pbc_is_on(p_vcd)) {
- lid_t lid=vcdinfo_get_multi_default_lid(p_vcd->vcd, p_vcd->cur_lid,
- itemid.num);
+#if defined(LIBVCD_VERSION)
+ lid_t lid=vcdinfo_get_multi_default_lid(p_vcd->vcd, p_vcd->i_lid,
+ p_vcd->i_lsn);
if (VCDINFO_INVALID_LID != lid) {
itemid.num = lid;
itemid.type = VCDINFO_ITEM_TYPE_LID;
- dbg_print(INPUT_DBG_PBC, "DEFAULT to %d\n", itemid.num);
+ dbg_print(INPUT_DBG_PBC, "DEFAULT to %d", itemid.num);
} else {
- dbg_print(INPUT_DBG_PBC, "no DEFAULT for LID %d\n", p_vcd->cur_lid);
+ dbg_print(INPUT_DBG_PBC, "no DEFAULT for LID %d", p_vcd->i_lid);
+ }
+
+#else
+ vcdinfo_lid_get_pxd(p_vcd->vcd, &(p_vcd->pxd), p_vcd->i_lid);
+
+ switch (p_vcd->pxd.descriptor_type) {
+ case PSD_TYPE_SELECTION_LIST:
+ case PSD_TYPE_EXT_SELECTION_LIST:
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
+ vcdinfo_get_default_offset(p_vcd->vcd,
+ p_vcd->i_lid),
+ &itemid.num, "default");
+ break;
+
+ case PSD_TYPE_PLAY_LIST:
+ case PSD_TYPE_END_LIST:
+ case PSD_TYPE_COMMAND_LIST:
+ LOG_WARN( "There is no PBC 'default' selection here" );
+ return VLC_FALSE;
}
+#endif /* LIBVCD_VERSION (< 0.7.21) */
} else {
}
/** ??? p_vcd->update_title(); ***/
- return VLC_SUCCESS == VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
+ return VLC_SUCCESS;
}
/*!
Play item assocated with the "next" selection.
- Return false if there was some problem.
+ Return VLC_FALSE if there was some problem.
*/
-bool
-vcdplayer_play_next( input_thread_t * p_input )
+vlc_bool_t
+vcdplayer_play_next( access_t * p_access )
{
- thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
- vcdinfo_obj_t *obj;
+ vcdinfo_obj_t *p_obj;
vcdinfo_itemid_t itemid;
- if (!p_vcd) return false;
+ if (!p_vcd) return VLC_FALSE;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
"current: %d" , p_vcd->play_item.num);
- obj = p_vcd->vcd;
+ p_obj = p_vcd->vcd;
itemid.type = p_vcd->play_item.type;
if (vcdplayer_pbc_is_on(p_vcd)) {
- vcdinfo_lid_get_pxd(obj, &(p_vcd->pxd), p_vcd->cur_lid);
+ vcdinfo_lid_get_pxd(p_obj, &(p_vcd->pxd), p_vcd->i_lid);
switch (p_vcd->pxd.descriptor_type) {
case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST:
- if (p_vcd->pxd.psd == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_psd_get_next_offset(p_vcd->pxd.psd),
&itemid.num, "next");
itemid.type = VCDINFO_ITEM_TYPE_LID;
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_pld_get_next_offset(p_vcd->pxd.pld),
&itemid.num, "next");
itemid.type = VCDINFO_ITEM_TYPE_LID;
case PSD_TYPE_END_LIST:
case PSD_TYPE_COMMAND_LIST:
LOG_WARN( "There is no PBC 'next' selection here" );
- return false;
+ return VLC_FALSE;
}
} else {
switch (p_vcd->play_item.type) {
case VCDINFO_ITEM_TYPE_ENTRY:
- max_entry = p_vcd->num_entries;
+ max_entry = p_vcd->i_entries;
break;
case VCDINFO_ITEM_TYPE_SEGMENT:
- max_entry = p_vcd->num_segments;
+ max_entry = p_vcd->i_segments;
break;
case VCDINFO_ITEM_TYPE_TRACK:
- max_entry = p_vcd->num_tracks;
+ max_entry = p_vcd->i_tracks;
break;
default: ; /* Handle exceptional cases below */
}
itemid.num = p_vcd->play_item.num+1;
} else {
LOG_WARN( "At the end - non-PBC 'next' not possible here" );
- return false;
+ return VLC_FALSE;
}
break;
{
/* Should have handled above. */
LOG_WARN( "Internal inconsistency - should not have gotten here." );
- return false;
+ return VLC_FALSE;
}
default:
- return false;
+ return VLC_FALSE;
}
}
/** ??? p_vcd->update_title(); ***/
- return VLC_SUCCESS == VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
+ return VLC_SUCCESS;
}
/*!
Play item assocated with the "prev" selection.
- Return false if there was some problem.
+ Return VLC_FALSE if there was some problem.
*/
-bool
-vcdplayer_play_prev( input_thread_t * p_input )
+vlc_bool_t
+vcdplayer_play_prev( access_t * p_access )
{
- thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
-
- vcdinfo_obj_t *obj = p_vcd->vcd;
- vcdinfo_itemid_t itemid;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+ vcdinfo_itemid_t itemid;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
"current: %d" , p_vcd->play_item.num);
if (vcdplayer_pbc_is_on(p_vcd)) {
- vcdinfo_lid_get_pxd(obj, &(p_vcd->pxd), p_vcd->cur_lid);
+ vcdinfo_lid_get_pxd(p_obj, &(p_vcd->pxd), p_vcd->i_lid);
switch (p_vcd->pxd.descriptor_type) {
case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST:
- if (p_vcd->pxd.psd == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_psd_get_prev_offset(p_vcd->pxd.psd),
&itemid.num, "prev");
itemid.type = VCDINFO_ITEM_TYPE_LID;
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_pld_get_prev_offset(p_vcd->pxd.pld),
&itemid.num, "prev");
itemid.type = VCDINFO_ITEM_TYPE_LID;
case PSD_TYPE_END_LIST:
case PSD_TYPE_COMMAND_LIST:
LOG_WARN( "There is no PBC 'prev' selection here" );
- return false;
+ return VLC_FALSE;
}
} else {
itemid.num = p_vcd->play_item.num-1;
} else {
LOG_WARN( "At the beginning - non-PBC 'prev' not possible here" );
- return false;
+ return VLC_FALSE;
}
}
/** ??? p_vcd->update_title(); ***/
- return VLC_SUCCESS == VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
+ return VLC_SUCCESS;
}
/*!
Play item assocated with the "return" selection.
- Return false if there was some problem.
+ Return VLC_FALSE if there was some problem.
*/
-bool
-vcdplayer_play_return( input_thread_t * p_input )
+vlc_bool_t
+vcdplayer_play_return( access_t * p_access )
{
- thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
-
- vcdinfo_obj_t *obj = p_vcd->vcd;
- vcdinfo_itemid_t itemid;
+ vcdplayer_t *p_vcd= (vcdplayer_t *)p_access->p_sys;
+ vcdinfo_obj_t *p_obj = p_vcd->vcd;
+ vcdinfo_itemid_t itemid;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
"current: %d" , p_vcd->play_item.num);
if (vcdplayer_pbc_is_on(p_vcd)) {
- vcdinfo_lid_get_pxd(obj, &(p_vcd->pxd), p_vcd->cur_lid);
+ vcdinfo_lid_get_pxd(p_obj, &(p_vcd->pxd), p_vcd->i_lid);
switch (p_vcd->pxd.descriptor_type) {
case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST:
- if (p_vcd->pxd.psd == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_psd_get_return_offset(p_vcd->pxd.psd),
&itemid.num, "return");
itemid.type = VCDINFO_ITEM_TYPE_LID;
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
- vcdplayer_update_entry( p_input,
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
+ vcdplayer_update_entry( p_access,
vcdinf_pld_get_return_offset(p_vcd->pxd.pld),
&itemid.num, "return");
itemid.type = VCDINFO_ITEM_TYPE_LID;
case PSD_TYPE_END_LIST:
case PSD_TYPE_COMMAND_LIST:
LOG_WARN( "There is no PBC 'return' selection here" );
- return false;
+ return VLC_FALSE;
}
} else {
}
/** ??? p_vcd->update_title(); ***/
- return VLC_SUCCESS == VCDPlay( p_input, itemid );
+ vcdplayer_play( p_access, itemid );
+ return VLC_SUCCESS;
}