Commit 3180a620 authored by Rémi Duraffort's avatar Rémi Duraffort

vcdx: use ifdef instead of if.

parent 8aa361fc
...@@ -512,7 +512,7 @@ VCDLIDs( access_t * p_access ) ...@@ -512,7 +512,7 @@ VCDLIDs( access_t * p_access )
vcdinfo_visit_lot (p_vcdplayer->vcd, false); vcdinfo_visit_lot (p_vcdplayer->vcd, false);
#if FIXED #ifdef FIXED
/* /*
We need to change libvcdinfo to be more robust when there are We need to change libvcdinfo to be more robust when there are
problems reading the extended PSD. Given that area-highlighting and problems reading the extended PSD. Given that area-highlighting and
...@@ -544,7 +544,7 @@ VCDLIDs( access_t * p_access ) ...@@ -544,7 +544,7 @@ VCDLIDs( access_t * p_access )
TAB_APPEND( t->i_seekpoint, t->seekpoint, s ); TAB_APPEND( t->i_seekpoint, t->seekpoint, s );
} }
#if DYNAMICALLY_ALLOCATED #ifdef DYNAMICALLY_ALLOCATED
TAB_APPEND( p_vcdplayer->i_titles, p_vcdplayer->p_title, t ); TAB_APPEND( p_vcdplayer->i_titles, p_vcdplayer->p_title, t );
#else #else
p_vcdplayer->p_title[p_vcdplayer->i_titles] = t; p_vcdplayer->p_title[p_vcdplayer->i_titles] = t;
...@@ -958,13 +958,13 @@ VCDOpen ( vlc_object_t *p_this ) ...@@ -958,13 +958,13 @@ VCDOpen ( vlc_object_t *p_this )
free( p_access->psz_demux ); free( p_access->psz_demux );
p_access->psz_demux = strdup( "ps" ); p_access->psz_demux = strdup( "ps" );
#if FIXED #ifdef FIXED
if (play_single_item) if (play_single_item)
VCDFixupPlayList( p_access, p_vcd, psz_source, &itemid, VCDFixupPlayList( p_access, p_vcd, psz_source, &itemid,
play_single_item ); play_single_item );
#endif #endif
#if FIXED #ifdef FIXED
p_vcdplayer->p_intf = intf_Create( p_access, "vcdx" ); p_vcdplayer->p_intf = intf_Create( p_access, "vcdx" );
p_vcdplayer->p_intf->b_block = false; p_vcdplayer->p_intf->b_block = false;
#endif #endif
......
...@@ -38,7 +38,7 @@ struct intf_sys_t ...@@ -38,7 +38,7 @@ struct intf_sys_t
mtime_t m_still_time; /* Time in microseconds remaining mtime_t m_still_time; /* Time in microseconds remaining
to wait in still frame. to wait in still frame.
*/ */
#if FINISHED #ifdef FINISHED
vcdplay_ctrl_t control; vcdplay_ctrl_t control;
#else #else
int control; int control;
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
*****************************************************************************/ *****************************************************************************/
typedef struct typedef struct
{ {
#if FINISHED #ifdef FINISHED
vcdplay_ptr vmg; vcdplay_ptr vmg;
#endif #endif
intf_thread_t * p_intf; intf_thread_t * p_intf;
#if DEMUX_FINISHED #ifdef DEMUX_FINISHED
int i_audio_nb; int i_audio_nb;
int i_spu_nb; int i_spu_nb;
#endif #endif
...@@ -44,7 +44,7 @@ typedef struct ...@@ -44,7 +44,7 @@ typedef struct
int i_still_time; int i_still_time;
bool b_end_of_cell; bool b_end_of_cell;
#if FINISHED #ifdef FINISHED
vcdplay_event_t event; vcdplay_event_t event;
vcdplay_ctrl_t control; vcdplay_ctrl_t control;
vcdplay_highlight_t hli; vcdplay_highlight_t hli;
......
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