mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
Tolerate compilation with vcdimager 0.7.20. Sigh.
This commit is contained in:
parent
99f8e80f10
commit
82957718f1
@ -1593,7 +1593,7 @@ then
|
||||
|
||||
if test "${enable_vcdx}" != "no"
|
||||
then
|
||||
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
|
||||
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
|
||||
[enable_vcd="no"
|
||||
AC_DEFINE(HAVE_VCDX, [],
|
||||
[Define for the VCD plugin using libcdio/libvcdinfo])
|
||||
|
@ -321,6 +321,7 @@ vcdplayer_play_default( input_thread_t * p_input )
|
||||
|
||||
if (vcdplayer_pbc_is_on(p_vcd)) {
|
||||
|
||||
#if defined(LIBVCD_VERSION)
|
||||
lid_t lid=vcdinfo_get_multi_default_lid(p_vcd->vcd, p_vcd->cur_lid,
|
||||
p_vcd->cur_lsn);
|
||||
|
||||
@ -331,6 +332,27 @@ vcdplayer_play_default( input_thread_t * p_input )
|
||||
} else {
|
||||
dbg_print(INPUT_DBG_PBC, "no DEFAULT for LID %d\n", p_vcd->cur_lid);
|
||||
}
|
||||
|
||||
#else
|
||||
vcdinfo_lid_get_pxd(p_vcd->vcd, &(p_vcd->pxd), p_vcd->cur_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,
|
||||
vcdinfo_get_default_offset(p_vcd->vcd,
|
||||
p_vcd->cur_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 false;
|
||||
}
|
||||
#endif /* LIBVCD_VERSION (< 0.7.21) */
|
||||
|
||||
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user