Skip to content

V
vlc
Commit 6f0aba82 authored by JP Dinger's avatar JP Dinger
Browse files
Options

Clean up vcdx a bit. Or a lot. It compiles, but I can't test. Since apparently... 

Clean up vcdx a bit. Or a lot. It compiles, but I can't test. Since apparently nobody uses this anyway it shouldn't be a big problem.
parent 4f050947
Expand all Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 708 deletions
modules/access/vcdx/Modules.am
View file @ 6f0aba82
SOURCES_vcdx = \ SOURCES_vcdx = \
access.h \
access.c \ access.c \
intf.c \
intf.h \
vcd.c \ vcd.c \
vcd.h \ vcd.h \
vcdplayer.h \ vcdplayer.h \
......
modules/access/vcdx/access.c
View file @ 6f0aba82
...@@ -48,10 +48,7 @@ ...@@ -48,10 +48,7 @@
#include <libvcd/logging.h> #include <libvcd/logging.h>
#include "vcd.h" #include "vcd.h"
#include "info.h" #include "info.h"
#include "intf.h" #include "access.h"
extern void VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
const vcdinfo_itemid_t *p_itemid );
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
...@@ -1039,12 +1036,12 @@ static int VCDControl( access_t *p_access, int i_query, va_list args ) ...@@ -1039,12 +1036,12 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
*/ */
case ACCESS_GET_META: case ACCESS_GET_META:
{ {
vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
dbg_print( INPUT_DBG_EVENT, "get meta info" ); dbg_print( INPUT_DBG_EVENT, "get meta info" );
#if 0 #if 0
if( p_vcdplayer->p_meta ) if( p_vcdplayer->p_meta )
{ {
vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg(args,vlc_meta_t**);
*pp_meta = vlc_meta_Duplicate( p_vcdplayer->p_meta ); *pp_meta = vlc_meta_Duplicate( p_vcdplayer->p_meta );
dbg_print( INPUT_DBG_META, "%s", "Meta copied" ); dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
} }
......
modules/access/vcdx/intf.h → modules/access/vcdx/access.h
View file @ 6f0aba82
/***************************************************************************** /*****************************************************************************
* intf.h: send info to intf. * access.h : VCD access.c routine headers
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 the VideoLAN team * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Author: Stéphane Borel <stef@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -16,37 +13,19 @@ ...@@ -16,37 +13,19 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VCD_ACCESS_H
#define VCD_ACCESS_H
#include <vlc_common.h> void VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
#include <vlc_input.h> const vcdinfo_itemid_t *p_itemid );
#include "vcdplayer.h"
/***************************************************************************** int VCDOpen ( vlc_object_t * );
* intf_sys_t: description and status of interface void VCDClose ( vlc_object_t * );
*****************************************************************************/
struct intf_sys_t
{
input_thread_t *p_input;
vcdplayer_t *p_vcdplayer;
bool b_still; /* True if we are in a still frame */
bool b_infinite_still; /* True if still wait time is infinite */
mtime_t m_still_time; /* Time in microseconds remaining
to wait in still frame.
*/
#ifdef FINISHED
vcdplay_ctrl_t control;
#else
int control;
#endif
bool b_click, b_move, b_key_pressed;
vlc_mutex_t lock;
};
int vcdIntfStillTime( struct intf_thread_t * p_intf, uint8_t wait_time); #endif /* VCD_ACCESS_H */
int vcdIntfResetStillTime( intf_thread_t *p_intf );
modules/access/vcdx/demux.c deleted 100644 → 0
View file @ 4f050947
/*****************************************************************************
* demux.c: demux functions for dvdplay.
*****************************************************************************
* Copyright (C) 1998-2001 the VideoLAN team
* $Id$
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stddef.h>
#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#ifdef STRNCASECMP_IN_STRINGS_H
# include <strings.h>
#endif
#include "vcd.h"
#include "vcdplayer.h"
#include "intf.h"
/* how many packets vcdx_Demux will read in each loop */
/* #define vcdplay_READ_ONCE 64 */
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Demux ( input_thread_t * );
/*****************************************************************************
* Private structure
*****************************************************************************/
struct demux_sys_t
{
vcd_data_t * p_vcd;
module_t * p_module;
mpeg_demux_t mpeg;
};
/*****************************************************************************
* VCDInit: initializes structures
*****************************************************************************/
int VCDInit ( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
vcd_data_t * p_vcd = (vcd_data_t *)p_input->p_sys;
demux_sys_t * p_demux;
printf("++++ VCDInit CALLED\n");
if( p_input->stream.i_method != INPUT_METHOD_VCD )
{
return VLC_EGENERIC;
}
p_demux = p_input->p_demux_data = malloc( sizeof(demux_sys_t ) );
if( p_demux == NULL )
{
return VLC_ENOMOD;
}
p_input->p_private = (void*)&p_demux->mpeg;
p_demux->p_module = module_need( p_input, "mpeg-system", NULL, false );
if( p_demux->p_module == NULL )
{
free( p_input->p_demux_data );
return VLC_ENOMOD;
}
p_input->p_demux_data->p_vcd = p_vcd;
p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
p_input->pf_rewind = NULL;
p_vcd->p_intf = NULL;
p_vcd->i_still_time = 0;
return VLC_SUCCESS;
}
/*****************************************************************************
* VCDEnd: frees unused data
*****************************************************************************/
void VCDEnd ( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
vcd_data_t * p_vcd = p_input->p_demux_data->p_vcd;
#if FIXED
intf_thread_t * p_intf = NULL;
p_intf = vlc_object_find( p_input, VLC_OBJECT_INTF, FIND_CHILD );
if( p_intf != NULL )
{
intf_StopThread( p_intf );
vlc_object_detach( p_intf );
vlc_object_release( p_intf );
vlc_object_release( p_intf );
}
p_vcd->p_intf = NULL;
#endif
module_unneed( p_input, p_input->p_demux_data->p_module );
free( p_input->p_demux_data );
}
/*****************************************************************************
* Demux
*****************************************************************************/
static int Demux( input_thread_t * p_input )
{
vcd_data_t * p_vcd;
data_packet_t * p_data;
ssize_t i_result;
ptrdiff_t i_remains;
int i_data_nb = 0;
p_vcd = p_input->p_demux_data->p_vcd;
/* Read headers to compute payload length */
do
{
i_result = p_input->p_demux_data->mpeg.pf_read_ps( p_input, &p_data );
if( i_result <= 0 )
{
return i_result;
}
i_remains = p_input->p_last_data - p_input->p_current_data;
p_input->p_demux_data->mpeg.pf_demux_ps( p_input, p_data );
++i_data_nb;
}
while( i_remains );
// if( p_vcd->b_still && p_vcd->b_end_of_cell && p_vcd->p_intf != NULL )
if( p_vcd->i_still_time && p_vcd->b_end_of_cell && p_vcd->p_intf != NULL )
{
pgrm_descriptor_t * p_pgrm;
/* when we receive still_time flag, we have to pause immediately */
var_SetInteger( p_input, "state", PAUSE_S );
vcdIntfStillTime( p_vcd->p_intf, p_vcd->i_still_time );
p_vcd->i_still_time = 0;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_pgrm = p_input->stream.p_selected_program;
p_pgrm->i_synchro_state = SYNCHRO_REINIT;
vlc_mutex_unlock( &p_input->stream.stream_lock );
input_ClockManageControl( p_input, p_pgrm, 0 );
}
return i_data_nb;
}
modules/access/vcdx/intf.c deleted 100644 → 0
View file @ 4f050947
This diff is collapsed.
modules/access/vcdx/vcd.c
View file @ 6f0aba82
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
/***************************************************************************** /*****************************************************************************
...@@ -37,23 +37,8 @@ ...@@ -37,23 +37,8 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_charset.h> #include <vlc_charset.h>
/***************************************************************************** #include "vcd.h"
* Exported prototypes #include "access.h"
*****************************************************************************/
int VCDOpen ( vlc_object_t * );
void VCDClose ( vlc_object_t * );
int VCDOpenIntf ( vlc_object_t * );
void VCDCloseIntf ( vlc_object_t * );
int VCDInit ( vlc_object_t * );
void VCDEnd ( vlc_object_t * );
int DebugCallback ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
int BlocksPerReadCallback ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
/***************************************************************************** /*****************************************************************************
* Option help text * Option help text
......
modules/access/vcdx/vcdplayer.c
View file @ 6f0aba82
...@@ -39,16 +39,12 @@ ...@@ -39,16 +39,12 @@
#include "vcd.h" #include "vcd.h"
#include "vcdplayer.h" #include "vcdplayer.h"
#include "intf.h" #include "access.h"
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/util.h> #include <cdio/util.h>
#include <libvcd/info.h> #include <libvcd/info.h>
extern void VCDSetOrigin ( access_t *p_access, lsn_t i_lsn, track_t i_track,
const vcdinfo_itemid_t * p_itemid );
/*! /*!
Return true if playback control (PBC) is on Return true if playback control (PBC) is on
*/ */
...@@ -112,7 +108,7 @@ vcdplayer_update_entry( access_t * p_access, uint16_t ofs, ...@@ -112,7 +108,7 @@ vcdplayer_update_entry( access_t * p_access, uint16_t ofs,
return true if the caller should return. return true if the caller should return.
*/ */
vcdplayer_read_status_t static vcdplayer_read_status_t
vcdplayer_non_pbc_nav ( access_t *p_access, uint8_t *wait_time ) vcdplayer_non_pbc_nav ( access_t *p_access, uint8_t *wait_time )
{ {
vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys; vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys;
...@@ -122,9 +118,7 @@ vcdplayer_non_pbc_nav ( access_t *p_access, uint8_t *wait_time ) ...@@ -122,9 +118,7 @@ vcdplayer_non_pbc_nav ( access_t *p_access, uint8_t *wait_time )
case VCDINFO_ITEM_TYPE_TRACK: case VCDINFO_ITEM_TYPE_TRACK:
case VCDINFO_ITEM_TYPE_ENTRY: { case VCDINFO_ITEM_TYPE_ENTRY: {
if ( ! vcdplayer_play_next( p_access ) ) if ( ! vcdplayer_play_next( p_access ) )
{
return READ_END; return READ_END;
}
break; break;
} }
case VCDINFO_ITEM_TYPE_SPAREID2: case VCDINFO_ITEM_TYPE_SPAREID2:
...@@ -368,25 +362,25 @@ vcdplayer_set_origin(access_t *p_access, lsn_t i_lsn, track_t i_track, ...@@ -368,25 +362,25 @@ vcdplayer_set_origin(access_t *p_access, lsn_t i_lsn, track_t i_track,
static bool static bool
vcdplayer_inc_play_item(access_t *p_access) vcdplayer_inc_play_item(access_t *p_access)
{ {
vcdplayer_t *p_vcdplayer = (vcdplayer_t *)p_access->p_sys; vcdplayer_t *p_vcdplayer = (vcdplayer_t *)p_access->p_sys;
int noi; int noi;
dbg_print(INPUT_DBG_CALL, "called pli: %d", p_vcdplayer->pdi); dbg_print(INPUT_DBG_CALL, "called pli: %d", p_vcdplayer->pdi);
if ( NULL == p_vcdplayer || NULL == p_vcdplayer->pxd.pld ) return false; if ( NULL == p_vcdplayer || NULL == p_vcdplayer->pxd.pld )
return false;
noi = vcdinf_pld_get_noi(p_vcdplayer->pxd.pld); noi = vcdinf_pld_get_noi(p_vcdplayer->pxd.pld);
if ( noi <= 0 )
if ( noi <= 0 ) return false; return false;
/* Handle delays like autowait or wait here? */ /* Handle delays like autowait or wait here? */
p_vcdplayer->pdi++; p_vcdplayer->pdi++;
if ( p_vcdplayer->pdi < 0 || p_vcdplayer->pdi >= noi ) return false; if ( p_vcdplayer->pdi < 0 || p_vcdplayer->pdi >= noi )
return false;
else {
uint16_t trans_itemid_num=vcdinf_pld_get_play_item(p_vcdplayer->pxd.pld, uint16_t trans_itemid_num=vcdinf_pld_get_play_item(p_vcdplayer->pxd.pld,
p_vcdplayer->pdi); p_vcdplayer->pdi);
vcdinfo_itemid_t trans_itemid; vcdinfo_itemid_t trans_itemid;
...@@ -397,7 +391,6 @@ vcdplayer_inc_play_item(access_t *p_access) ...@@ -397,7 +391,6 @@ vcdplayer_inc_play_item(access_t *p_access)
dbg_print(INPUT_DBG_PBC, " play-item[%d]: %s", dbg_print(INPUT_DBG_PBC, " play-item[%d]: %s",
p_vcdplayer->pdi, vcdinfo_pin2str (trans_itemid_num)); p_vcdplayer->pdi, vcdinfo_pin2str (trans_itemid_num));
return vcdplayer_play_single_item(p_access, trans_itemid); return vcdplayer_play_single_item(p_access, trans_itemid);
}
} }
void void
...@@ -415,7 +408,8 @@ vcdplayer_play(access_t *p_access, vcdinfo_itemid_t itemid) ...@@ -415,7 +408,8 @@ vcdplayer_play(access_t *p_access, vcdinfo_itemid_t itemid)
vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd; vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
if (p_vcdinfo == NULL) return; if (p_vcdinfo == NULL)
return;
p_vcdplayer->i_lid = itemid.num; p_vcdplayer->i_lid = itemid.num;
vcdinfo_lid_get_pxd(p_vcdinfo, &(p_vcdplayer->pxd), itemid.num); vcdinfo_lid_get_pxd(p_vcdinfo, &(p_vcdplayer->pxd), itemid.num);
...@@ -453,7 +447,7 @@ vcdplayer_play(access_t *p_access, vcdinfo_itemid_t itemid) ...@@ -453,7 +447,7 @@ vcdplayer_play(access_t *p_access, vcdinfo_itemid_t itemid)
} }
/* Handles PBC navigation when reaching the end of a play item. */ /* Handles PBC navigation when reaching the end of a play item. */
vcdplayer_read_status_t static vcdplayer_read_status_t
vcdplayer_pbc_nav ( access_t * p_access, uint8_t *wait_time ) vcdplayer_pbc_nav ( access_t * p_access, uint8_t *wait_time )
{ {
vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys; vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys;
...@@ -592,7 +586,7 @@ vcdplayer_read (access_t * p_access, uint8_t *p_buf) ...@@ -592,7 +586,7 @@ vcdplayer_read (access_t * p_access, uint8_t *p_buf)
{ {
/* p_access->handle_events (); */ /* p_access->handle_events (); */
uint8_t wait_time; uint8_t wait_time=0;
vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys; vcdplayer_t *p_vcdplayer= (vcdplayer_t *)p_access->p_sys;
if ( p_vcdplayer->i_lsn > p_vcdplayer->end_lsn ) { if ( p_vcdplayer->i_lsn > p_vcdplayer->end_lsn ) {
...@@ -600,7 +594,8 @@ vcdplayer_read (access_t * p_access, uint8_t *p_buf) ...@@ -600,7 +594,8 @@ vcdplayer_read (access_t * p_access, uint8_t *p_buf)
/* We've run off of the end of this entry. Do we continue or stop? */ /* We've run off of the end of this entry. Do we continue or stop? */
dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC), dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
"end reached, cur: %u, end: %u\n", p_vcdplayer->i_lsn, p_vcdplayer->end_lsn); "end reached, cur: %u, end: %u\n",
p_vcdplayer->i_lsn, p_vcdplayer->end_lsn);
handle_item_continuation: handle_item_continuation:
read_status = vcdplayer_pbc_is_on( p_vcdplayer ) read_status = vcdplayer_pbc_is_on( p_vcdplayer )
...@@ -705,13 +700,14 @@ vcdplayer_play_default( access_t * p_access ) ...@@ -705,13 +700,14 @@ vcdplayer_play_default( access_t * p_access )
} }
#else #else
vcdinfo_lid_get_pxd(p_vcdplayer->vcd, &(p_vcdplayer->pxd), p_vcdplayer->i_lid); vcdinfo_lid_get_pxd(p_vcdplayer->vcd, &(p_vcdplayer->pxd),
p_vcdplayer->i_lid);
switch (p_vcdplayer->pxd.descriptor_type) { switch (p_vcdplayer->pxd.descriptor_type) {
case PSD_TYPE_SELECTION_LIST: case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST: case PSD_TYPE_EXT_SELECTION_LIST:
if (p_vcdplayer->pxd.psd == NULL) return false; if (p_vcdplayer->pxd.psd == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinfo_get_default_offset(p_vcdplayer->vcd, vcdinfo_get_default_offset(p_vcdplayer->vcd,
p_vcdplayer->i_lid), p_vcdplayer->i_lid),
&itemid.num, "default"); &itemid.num, "default");
...@@ -771,7 +767,7 @@ vcdplayer_play_next( access_t * p_access ) ...@@ -771,7 +767,7 @@ vcdplayer_play_next( access_t * p_access )
case PSD_TYPE_SELECTION_LIST: case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST: case PSD_TYPE_EXT_SELECTION_LIST:
if (p_vcdplayer->pxd.psd == NULL) return false; if (p_vcdplayer->pxd.psd == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_psd_get_next_offset(p_vcdplayer->pxd.psd), vcdinf_psd_get_next_offset(p_vcdplayer->pxd.psd),
&itemid.num, "next"); &itemid.num, "next");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -779,7 +775,7 @@ vcdplayer_play_next( access_t * p_access ) ...@@ -779,7 +775,7 @@ vcdplayer_play_next( access_t * p_access )
case PSD_TYPE_PLAY_LIST: case PSD_TYPE_PLAY_LIST:
if (p_vcdplayer->pxd.pld == NULL) return false; if (p_vcdplayer->pxd.pld == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_pld_get_next_offset(p_vcdplayer->pxd.pld), vcdinf_pld_get_next_offset(p_vcdplayer->pxd.pld),
&itemid.num, "next"); &itemid.num, "next");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -824,11 +820,9 @@ vcdplayer_play_next( access_t * p_access ) ...@@ -824,11 +820,9 @@ vcdplayer_play_next( access_t * p_access )
break; break;
case VCDINFO_ITEM_TYPE_LID: case VCDINFO_ITEM_TYPE_LID:
{
/* Should have handled above. */ /* Should have handled above. */
LOG_WARN( "Internal inconsistency - should not have gotten here." ); LOG_WARN( "Internal inconsistency - should not have gotten here." );
return false; return false;
}
default: default:
return false; return false;
} }
...@@ -865,7 +859,7 @@ vcdplayer_play_prev( access_t * p_access ) ...@@ -865,7 +859,7 @@ vcdplayer_play_prev( access_t * p_access )
case PSD_TYPE_SELECTION_LIST: case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST: case PSD_TYPE_EXT_SELECTION_LIST:
if (p_vcdplayer->pxd.psd == NULL) return false; if (p_vcdplayer->pxd.psd == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_psd_get_prev_offset(p_vcdplayer->pxd.psd), vcdinf_psd_get_prev_offset(p_vcdplayer->pxd.psd),
&itemid.num, "prev"); &itemid.num, "prev");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -873,7 +867,7 @@ vcdplayer_play_prev( access_t * p_access ) ...@@ -873,7 +867,7 @@ vcdplayer_play_prev( access_t * p_access )
case PSD_TYPE_PLAY_LIST: case PSD_TYPE_PLAY_LIST:
if (p_vcdplayer->pxd.pld == NULL) return false; if (p_vcdplayer->pxd.pld == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_pld_get_prev_offset(p_vcdplayer->pxd.pld), vcdinf_pld_get_prev_offset(p_vcdplayer->pxd.pld),
&itemid.num, "prev"); &itemid.num, "prev");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -931,7 +925,7 @@ vcdplayer_play_return( access_t * p_access ) ...@@ -931,7 +925,7 @@ vcdplayer_play_return( access_t * p_access )
case PSD_TYPE_SELECTION_LIST: case PSD_TYPE_SELECTION_LIST:
case PSD_TYPE_EXT_SELECTION_LIST: case PSD_TYPE_EXT_SELECTION_LIST:
if (p_vcdplayer->pxd.psd == NULL) return false; if (p_vcdplayer->pxd.psd == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_psd_get_return_offset(p_vcdplayer->pxd.psd), vcdinf_psd_get_return_offset(p_vcdplayer->pxd.psd),
&itemid.num, "return"); &itemid.num, "return");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -939,7 +933,7 @@ vcdplayer_play_return( access_t * p_access ) ...@@ -939,7 +933,7 @@ vcdplayer_play_return( access_t * p_access )
case PSD_TYPE_PLAY_LIST: case PSD_TYPE_PLAY_LIST:
if (p_vcdplayer->pxd.pld == NULL) return false; if (p_vcdplayer->pxd.pld == NULL) return false;
vcdplayer_update_entry( p_access, vcdplayer_update_entry(p_access,
vcdinf_pld_get_return_offset(p_vcdplayer->pxd.pld), vcdinf_pld_get_return_offset(p_vcdplayer->pxd.pld),
&itemid.num, "return"); &itemid.num, "return");
itemid.type = VCDINFO_ITEM_TYPE_LID; itemid.type = VCDINFO_ITEM_TYPE_LID;
...@@ -965,11 +959,3 @@ vcdplayer_play_return( access_t * p_access ) ...@@ -965,11 +959,3 @@ vcdplayer_play_return( access_t * p_access )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/*
* Local variables:
* c-file-style: "gnu"
* tab-width: 8
* indent-tabs-mode: nil
* End:
*/
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