Commit 5fd57071 authored by Rocky Bernstein's avatar Rocky Bernstein

Correct multi-default selection. But we need vcdimager 0.71 CVS for

this.  (But most poeple won't notice the improvement since video
switching is broken.)
parent b60f0307
...@@ -1575,7 +1575,7 @@ then ...@@ -1575,7 +1575,7 @@ then
if test "${enable_vcdx}" != "no" if test "${enable_vcdx}" != "no"
then then
PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20, PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
[enable_vcd="no" [enable_vcd="no"
AC_DEFINE(HAVE_VCDX, [], AC_DEFINE(HAVE_VCDX, [],
[Define for the VCD plugin using libcdio/libvcdinfo]) [Define for the VCD plugin using libcdio/libvcdinfo])
......
...@@ -307,6 +307,13 @@ vcdplayer_play_default( input_thread_t * p_input ) ...@@ -307,6 +307,13 @@ vcdplayer_play_default( input_thread_t * p_input )
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), dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
"current: %d" , p_vcd->play_item.num); "current: %d" , p_vcd->play_item.num);
...@@ -315,7 +322,7 @@ vcdplayer_play_default( input_thread_t * p_input ) ...@@ -315,7 +322,7 @@ vcdplayer_play_default( input_thread_t * p_input )
if (vcdplayer_pbc_is_on(p_vcd)) { if (vcdplayer_pbc_is_on(p_vcd)) {
lid_t lid=vcdinfo_get_multi_default_lid(p_vcd->vcd, p_vcd->cur_lid, lid_t lid=vcdinfo_get_multi_default_lid(p_vcd->vcd, p_vcd->cur_lid,
itemid.num); p_vcd->cur_lsn);
if (VCDINFO_INVALID_LID != lid) { if (VCDINFO_INVALID_LID != lid) {
itemid.num = lid; itemid.num = lid;
......
/***************************************************************************** /*****************************************************************************
* Copyright (C) 2003 Rocky Bernstein (for VideoLAN) * Copyright (C) 2003, 2004 Rocky Bernstein (for VideoLAN)
* $Id: vcdplayer.h,v 1.5 2004/01/03 20:43:24 rocky Exp $ * $Id$
* *
* Authors: Rocky Bernstein <rocky@panix.com> * Authors: Rocky Bernstein <rocky@panix.com>
* *
...@@ -76,7 +76,7 @@ typedef struct thread_vcd_data_s ...@@ -76,7 +76,7 @@ typedef struct thread_vcd_data_s
int cur_lid; /* LID that play item is in. Implies int cur_lid; /* LID that play item is in. Implies
PBC is on. VCDPLAYER_BAD_ENTRY if PBC is on. VCDPLAYER_BAD_ENTRY if
not none or not in PBC */ not none or not in PBC */
PsdListDescriptor pxd; /* If PBC is on, the relevant PsdListDescriptor_t pxd; /* If PBC is on, the relevant
PSD/PLD */ PSD/PLD */
int pdi; /* current pld index of pxd. -1 if int pdi; /* current pld index of pxd. -1 if
no index*/ no index*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment