From: Rocky Bernstein <rocky@videolan.org>
Date: Sun, 28 Mar 2004 20:17:49 +0000 (+0000)
Subject: Correct multi-default selection. But we need vcdimager 0.71 CVS for
X-Git-Tag: 0.7.2~566
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5fd57071bda1c5b407bc8c28d4123883143690af;p=vlc

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.)
---

diff --git a/configure.ac b/configure.ac
index df24bd3242..f7b6a30f08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1575,7 +1575,7 @@ then
 
   if test "${enable_vcdx}" != "no"
   then
-    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
+    PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
      [enable_vcd="no"
       AC_DEFINE(HAVE_VCDX, [], 
       [Define for the VCD plugin using libcdio/libvcdinfo])
diff --git a/modules/access/vcdx/vcdplayer.c b/modules/access/vcdx/vcdplayer.c
index 15ce3223e1..302ced303a 100644
--- a/modules/access/vcdx/vcdplayer.c
+++ b/modules/access/vcdx/vcdplayer.c
@@ -307,6 +307,13 @@ vcdplayer_play_default( input_thread_t * p_input )
 
   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);
 
@@ -315,7 +322,7 @@ vcdplayer_play_default( input_thread_t * p_input )
   if  (vcdplayer_pbc_is_on(p_vcd)) {
 
     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) {
       itemid.num  = lid;
diff --git a/modules/access/vcdx/vcdplayer.h b/modules/access/vcdx/vcdplayer.h
index f0e9dbd8fb..d986335800 100644
--- a/modules/access/vcdx/vcdplayer.h
+++ b/modules/access/vcdx/vcdplayer.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
- * Copyright (C) 2003 Rocky Bernstein (for VideoLAN)
- * $Id: vcdplayer.h,v 1.5 2004/01/03 20:43:24 rocky Exp $
+ * Copyright (C) 2003, 2004 Rocky Bernstein (for VideoLAN)
+ * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *
@@ -76,7 +76,7 @@ typedef struct thread_vcd_data_s
   int          cur_lid;                 /* LID that play item is in. Implies 
                                            PBC is on. VCDPLAYER_BAD_ENTRY if 
                                            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 */
   int          pdi;                     /* current pld index of pxd. -1 if 
                                            no index*/