From c230c220f5bf080453ae832193d895785e23d689 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Wed, 29 Dec 2004 16:09:50 +0000 Subject: Make xine-lib compile with 0.7.20 vcdimager. CVS patchset: 7309 CVS date: 2004/12/29 16:09:50 --- src/input/vcd/vcdplayer.c | 8 +++++++- src/input/vcd/vcdplayer.h | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/input/vcd/vcdplayer.c b/src/input/vcd/vcdplayer.c index 802c4e508..c70719bde 100644 --- a/src/input/vcd/vcdplayer.c +++ b/src/input/vcd/vcdplayer.c @@ -1,5 +1,5 @@ /* - $Id: vcdplayer.c,v 1.7 2004/12/29 09:23:56 rockyb Exp $ + $Id: vcdplayer.c,v 1.8 2004/12/29 16:09:50 jcdutton Exp $ Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -715,6 +715,12 @@ _vcdplayer_set_origin(vcdplayer_t *p_vcdplayer) p_vcdplayer->sleep(250000); /* if (p_vcdplayer->i_still) p_vcdplayer->force_redisplay(); */ +#ifndef LIBVCD_VERSION +/* Older version of vcdimager. You really should consider using 0.7.21 + or later as that has bug and memory leak fixes. */ +lid_t +vcdplayer_selection2lid (vcdplayer_t *p_vcdplayer, int entry_num); +#endif /* Handles PBC navigation when reaching the end of a play item. */ static vcdplayer_read_status_t diff --git a/src/input/vcd/vcdplayer.h b/src/input/vcd/vcdplayer.h index 5b2d1ce4b..4d354bae4 100644 --- a/src/input/vcd/vcdplayer.h +++ b/src/input/vcd/vcdplayer.h @@ -1,5 +1,5 @@ /* - $Id: vcdplayer.h,v 1.2 2004/12/29 09:23:56 rockyb Exp $ + $Id: vcdplayer.h,v 1.3 2004/12/29 16:09:50 jcdutton Exp $ Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -149,7 +149,7 @@ typedef struct vcdplayer_input_s { int i_lid; /* LID that play item is in. Implies PBC is. on. VCDPLAYER_BAD_ENTRY if not none or not in PBC */ - PsdListDescriptor_t pxd; /* If PBC is on, the relevant PSD/PLD */ + PsdListDescriptor pxd; /* If PBC is on, the relevant PSD/PLD */ int pdi; /* current pld index of pxd. -1 if no index*/ -- cgit v1.2.3