byte_t * p_buffer );
static char *VCDParse ( input_thread_t *,
/*out*/ vcdinfo_itemid_t * p_itemid ,
- /*out*/ bool *play_single_item );
+ /*out*/ vlc_bool_t *play_single_item );
static void VCDUpdateVar( input_thread_t *p_input, int i_entry, int i_action,
const char *p_varname, char *p_label,
{
thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
input_area_t * p_area;
- bool b_was_still;
+ vlc_bool_t b_was_still;
dbg_print(INPUT_DBG_CALL, "itemid.num: %d, itemid.type: %d\n",
itemid.num, itemid.type);
LOG_ERR ("Invalid track number %d", itemid.num );
return VLC_EGENERIC;
}
- p_vcd->in_still = false;
+ p_vcd->in_still = VLC_FALSE;
p_area = area[itemid.num];
p_area->i_part = p_area->i_plugin_data;
p_input->stream.b_seekable = 1;
case VCDINFO_FILES_VIDEO_PAL_STILL:
case VCDINFO_FILES_VIDEO_PAL_STILL2:
p_input->stream.b_seekable = 0;
- p_vcd->in_still = true;
+ p_vcd->in_still = VLC_TRUE;
break;
default:
p_input->stream.b_seekable = 1;
- p_vcd->in_still = false;
+ p_vcd->in_still = VLC_FALSE;
}
}
break;
return VLC_EGENERIC;
} else {
track_t cur_track = vcdinfo_get_track(p_vcd->vcd, itemid.num);
- p_vcd->in_still = false;
+ p_vcd->in_still = VLC_FALSE;
p_area = area[cur_track];
p_area->i_part = itemid.num;
p_input->stream.b_seekable = 1;
else
msg_Warn( p_input, "wrong track number found in entry points" );
}
- p_vcd->b_valid_ep = true;
+ p_vcd->b_valid_ep = VLC_TRUE;
return 0;
}
if (vcdinfo_read_psd (p_vcd->vcd)) {
- vcdinfo_visit_lot (p_vcd->vcd, false);
+ vcdinfo_visit_lot (p_vcd->vcd, VLC_FALSE);
#if FIXED
/*
it's best then to not try to read this at all.
*/
if (vcdinfo_get_psd_x_size(p_vcd->vcd))
- vcdinfo_visit_lot (p_vcd->vcd, true);
+ vcdinfo_visit_lot (p_vcd->vcd, VLC_TRUE);
#endif
}
*****************************************************************************/
static char *
VCDParse( input_thread_t * p_input, /*out*/ vcdinfo_itemid_t * p_itemid,
- /*out*/ bool *play_single_item )
+ /*out*/ vlc_bool_t *play_single_item )
{
thread_vcd_data_t *p_vcd = (thread_vcd_data_t *)p_input->p_access_data;
char * psz_parser;
char * psz_source;
char * psz_next;
- if ( config_GetInt( p_input, MODULE_STRING "-PBC" ) ) {
- p_itemid->type=VCDINFO_ITEM_TYPE_LID;
- p_itemid->num=1;
- *play_single_item=false;
- } else {
- p_itemid->type=VCDINFO_ITEM_TYPE_ENTRY;
- p_itemid->num=0;
+ if( config_GetInt( p_input, MODULE_STRING "-PBC" ) ) {
+ p_itemid->type = VCDINFO_ITEM_TYPE_LID;
+ p_itemid->num = 1;
+ *play_single_item = VLC_FALSE;
+ }
+ else
+ {
+ p_itemid->type = VCDINFO_ITEM_TYPE_ENTRY;
+ p_itemid->num = 0;
}
#ifdef WIN32
case 'E':
p_itemid->type = VCDINFO_ITEM_TYPE_ENTRY;
++psz_parser;
- *play_single_item = true;
+ *play_single_item = VLC_TRUE;
break;
case 'P':
p_itemid->type = VCDINFO_ITEM_TYPE_LID;
++psz_parser;
- *play_single_item = false;
+ *play_single_item = VLC_FALSE;
break;
case 'S':
p_itemid->type = VCDINFO_ITEM_TYPE_SEGMENT;
++psz_parser;
- *play_single_item = true;
+ *play_single_item = VLC_TRUE;
break;
case 'T':
p_itemid->type = VCDINFO_ITEM_TYPE_TRACK;
++psz_parser;
- *play_single_item = true;
+ *play_single_item = VLC_TRUE;
break;
default: ;
}
if( !psz_source || 0==strlen(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
- |CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN),
- true);
- if (NULL == cd_drives) return NULL;
- if (cd_drives[0] == NULL) {
- cdio_free_device_list(cd_drives);
+ char **cd_drives = cdio_get_devices_with_cap( NULL,
+ ( CDIO_FS_ANAL_SVCD | CDIO_FS_ANAL_CVD
+ |CDIO_FS_ANAL_VIDEOCD | CDIO_FS_UNKNOWN ),
+ VLC_TRUE );
+ if( NULL == cd_drives ) return NULL;
+ if( cd_drives[0] == NULL )
+ {
+ cdio_free_device_list( cd_drives );
return NULL;
}
- psz_source = strdup(cd_drives[0]);
- cdio_free_device_list(cd_drives);
+ psz_source = strdup( cd_drives[0] );
+ cdio_free_device_list( cd_drives );
}
}
} vcdsector_t;
vcdsector_t vcd_sector;
- if (cdio_read_mode2_sector(vcdinfo_get_cd_image(p_vcd),
- &vcd_sector, cur_lsn, true)
+ if( cdio_read_mode2_sector( vcdinfo_get_cd_image( p_vcd ),
+ &vcd_sector, cur_lsn, VLC_TRUE )
!= 0)
- {
+ {
msg_Warn( p_this, "Could not read LSN %lu",
(long unsigned int) cur_lsn );
return -1;
- }
+ }
memcpy (p_buffer, vcd_sector.data, M2F2_SECTOR_SIZE);
strncat(tp, str, TEMP_STR_LEN-(tp-temp_str)); \
tp += len; \
} \
- saw_control_prefix = false; \
+ saw_control_prefix = VLC_FALSE; \
} \
}
-#define add_format_num_info(val, fmt) \
+#define add_format_num_info( val, fmt ) \
{ \
char num_str[10]; \
unsigned int len; \
sprintf(num_str, fmt, val); \
- len=strlen(num_str); \
- if (len != 0) { \
+ len = strlen(num_str); \
+ if( len != 0 ) \
+ { \
strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str)); \
tp += len; \
} \
- saw_control_prefix = false; \
+ saw_control_prefix = VLC_FALSE; \
}
/*!
#define TEMP_STR_SIZE 256
#define TEMP_STR_LEN (TEMP_STR_SIZE-1)
static char temp_str[TEMP_STR_SIZE];
- size_t i;
- char * tp = temp_str;
- bool saw_control_prefix = false;
- size_t format_len = strlen(format_str);
+ size_t i;
+ char * tp = temp_str;
+ vlc_bool_t saw_control_prefix = VLC_FALSE;
+ size_t format_len = strlen(format_str);
memset(temp_str, 0, TEMP_STR_SIZE);
if (!saw_control_prefix && format_str[i] != '%') {
*tp++ = format_str[i];
- saw_control_prefix = false;
+ saw_control_prefix = VLC_FALSE;
continue;
}
/* What to do? */
;
}
- saw_control_prefix = false;
+ saw_control_prefix = VLC_FALSE;
}
break;
strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str));
tp += strlen(num_str);
}
- saw_control_prefix = false;
+ saw_control_prefix = VLC_FALSE;
break;
case 'M':
strncat(tp, seg_type_str, TEMP_STR_LEN-(tp-temp_str));
tp += strlen(seg_type_str);
}
- saw_control_prefix = false;
+ saw_control_prefix = VLC_FALSE;
break;
case 'T':
default:
*tp++ = '%';
*tp++ = format_str[i];
- saw_control_prefix = false;
+ saw_control_prefix = VLC_FALSE;
}
}
return strdup(temp_str);
static int
VCDFixupPlayList( input_thread_t *p_input, thread_vcd_data_t *p_vcd,
const char *psz_source, vcdinfo_itemid_t *itemid,
- bool play_single_item )
+ vlc_bool_t play_single_item )
{
unsigned int i;
playlist_t * p_playlist;
thread_vcd_data_t * p_vcd;
char * psz_source;
vcdinfo_itemid_t itemid;
- bool b_play_ok;
- bool play_single_item = false;
+ vlc_bool_t b_play_ok;
+ vlc_bool_t play_single_item = VLC_FALSE;
p_input->pf_read = VCDRead;
p_input->pf_seek = VCDSeek;
p_input->p_access_data = (void *)p_vcd;
p_vcd->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" );
- p_vcd->in_still = false;
+ p_vcd->in_still = VLC_FALSE;
p_vcd->play_item.type = VCDINFO_ITEM_TYPE_NOTFOUND;
/* Set where to log errors messages from libcdio. */
goto err_exit;
}
- p_vcd->b_svd= vcdinfo_get_tracksSVD(p_vcd->vcd);;
+ p_vcd->b_svd= (vlc_bool_t) vcdinfo_get_tracksSVD(p_vcd->vcd);;
/* Get track information. */
p_vcd->num_tracks = ioctl_GetTracksMap( VLC_OBJECT(p_input),
if( VCDEntryPoints( p_input ) < 0 )
{
msg_Warn( p_input, "could not read entry points, will not use them" );
- p_vcd->b_valid_ep = false;
+ p_vcd->b_valid_ep = VLC_FALSE;
}
if( VCDLIDs( p_input ) < 0 )
* cdrom.c: cdrom tools
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: cdrom.c,v 1.1 2003/10/04 18:55:13 gbazin Exp $
+ * $Id$
*
* Authors: Johan Bilien <jobi@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
} vcdsector_t;
vcdsector_t vcd_sector;
- if (cdio_read_mode2_sector(p_cddev->cdio, &vcd_sector, i_sector, true)
+ if( cdio_read_mode2_sector(p_cddev->cdio, &vcd_sector, i_sector, VLC_TRUE)
!= 0)
- {
+ {
// msg_Err( p_this, "Could not read sector %d", i_sector );
return -1;
- }
+ }
memcpy (p_buffer, vcd_sector.data, M2F2_SECTOR_SIZE);
* using libcdio, libvcd and libvcdinfo
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: vcd.h,v 1.4 2003/11/26 02:41:02 rocky Exp $
+ * $Id$
*
* Authors: Rocky Bernstein <rocky@panix.com>
*
#endif
int i_still_time;
- bool b_end_of_cell;
+ vlc_bool_t b_end_of_cell;
#if FINISHED
vcdplay_event_t event;
#endif
/*!
- 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 thread_vcd_data_t *p_vcd )
{
return VCDINFO_INVALID_ENTRY != p_vcd->cur_lid;
}
-static void
-vcdplayer_update_entry( input_thread_t * p_input, uint16_t ofs,
+static void vcdplayer_update_entry( input_thread_t * p_input, uint16_t ofs,
uint16_t *entry, const char *label)
{
thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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 ( input_thread_t * p_input )
{
thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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( input_thread_t *p_input )
{
thread_vcd_data_t * p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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",
/*!
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( input_thread_t * p_input )
{
thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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;
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinfo_get_default_offset(p_vcd->vcd,
p_vcd->cur_lid),
case PSD_TYPE_END_LIST:
case PSD_TYPE_COMMAND_LIST:
LOG_WARN( "There is no PBC 'default' selection here" );
- return false;
+ return VLC_FALSE;
}
#endif /* LIBVCD_VERSION (< 0.7.21) */
/*!
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( input_thread_t * p_input )
{
thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
vcdinfo_obj_t *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);
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;
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_psd_get_next_offset(p_vcd->pxd.psd),
&itemid.num, "next");
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_pld_get_next_offset(p_vcd->pxd.pld),
&itemid.num, "next");
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 {
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;
}
}
/*!
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( input_thread_t * p_input )
{
thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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;
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_psd_get_prev_offset(p_vcd->pxd.psd),
&itemid.num, "prev");
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_pld_get_prev_offset(p_vcd->pxd.pld),
&itemid.num, "prev");
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;
}
}
/*!
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( input_thread_t * p_input )
{
thread_vcd_data_t *p_vcd= (thread_vcd_data_t *)p_input->p_access_data;
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;
+ if (p_vcd->pxd.psd == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_psd_get_return_offset(p_vcd->pxd.psd),
&itemid.num, "return");
break;
case PSD_TYPE_PLAY_LIST:
- if (p_vcd->pxd.pld == NULL) return false;
+ if (p_vcd->pxd.pld == NULL) return VLC_FALSE;
vcdplayer_update_entry( p_input,
vcdinf_pld_get_return_offset(p_vcd->pxd.pld),
&itemid.num, "return");
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 {
typedef struct thread_vcd_data_s
{
vcdinfo_obj_t *vcd; /* CD device descriptor */
- bool in_still; /* true if in still */
- bool b_svd; /* true if we have SVD info */
+ vlc_bool_t in_still; /* true if in still */
+ vlc_bool_t b_svd; /* true if we have SVD info */
unsigned int num_tracks; /* Nb of tracks (titles) */
unsigned int num_segments; /* Nb of segments */
unsigned int num_entries; /* Nb of entries */
lsn_t * p_sectors; /* Track sectors */
lsn_t * p_entries; /* Entry points */
lsn_t * p_segments; /* Segments */
- bool b_valid_ep; /* Valid entry points flag */
+ vlc_bool_t b_valid_ep; /* Valid entry points flag */
vlc_bool_t b_end_of_track; /* If the end of track was reached */
int i_debug; /* Debugging mask */
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( input_thread_t *p_input );
/*!
Return true if playback control (PBC) is on
*/
-bool vcdplayer_pbc_is_on(const thread_vcd_data_t *p_this);
+vlc_bool_t vcdplayer_pbc_is_on(const thread_vcd_data_t *p_this);
/*!
Play item assocated with the "default" selection.
Return false if there was some problem.
*/
-bool vcdplayer_play_default( input_thread_t * p_input );
+vlc_bool_t vcdplayer_play_default( input_thread_t * p_input );
/*!
Play item assocated with the "next" selection.
Return false if there was some problem.
*/
-bool vcdplayer_play_next( input_thread_t * p_input );
+vlc_bool_t vcdplayer_play_next( input_thread_t * p_input );
/*!
Play item assocated with the "prev" selection.
Return false if there was some problem.
*/
-bool vcdplayer_play_prev( input_thread_t * p_input );
+vlc_bool_t vcdplayer_play_prev( input_thread_t * p_input );
/*!
Play item assocated with the "return" selection.
Return false if there was some problem.
*/
-bool
+vlc_bool_t
vcdplayer_play_return( input_thread_t * p_input );
vcdplayer_read_status_t vcdplayer_pbc_nav ( input_thread_t * p_input );
projects / vlc / commitdiff