Commit 3d727062 authored by Christophe Massiot's avatar Christophe Massiot

Change --enable-debug into --enable-trace. Same with DEBUG_*.

--enable-debug still exists, but only activates -g and additional
safety checks.

I hope I didn't break anything :))
parent 092858e0
...@@ -34,6 +34,7 @@ ARCH = @ARCH@ ...@@ -34,6 +34,7 @@ ARCH = @ARCH@
# #
DEBUG = @DEBUG@ DEBUG = @DEBUG@
STATS = @STATS@ STATS = @STATS@
TRACE = @TRACE@
OPTIMS = @OPTIMS@ OPTIMS = @OPTIMS@
GETOPT = @GETOPT@ GETOPT = @GETOPT@
...@@ -89,8 +90,12 @@ ifeq ($(DEBUG),1) ...@@ -89,8 +90,12 @@ ifeq ($(DEBUG),1)
PROGRAM_OPTIONS += DEBUG PROGRAM_OPTIONS += DEBUG
DEFINE += -DDEBUG DEFINE += -DDEBUG
endif endif
ifeq ($(TRACE),1)
PROGRAM_OPTIONS += TRACE
DEFINE += -DTRACE
endif
ifeq ($(STATS),1) ifeq ($(STATS),1)
PROGRAM_OPTIONS += DEBUG PROGRAM_OPTIONS += STATS
DEFINE += -DSTATS DEFINE += -DSTATS
endif endif
...@@ -161,7 +166,9 @@ endif ...@@ -161,7 +166,9 @@ endif
ifeq ($(OPTIMS),1) ifeq ($(OPTIMS),1)
CFLAGS += -O3 CFLAGS += -O3
CFLAGS += -ffast-math -funroll-loops CFLAGS += -ffast-math -funroll-loops
ifneq ($(DEBUG),1)
CFLAGS += -fomit-frame-pointer CFLAGS += -fomit-frame-pointer
endif
# Optimizations for x86 familiy # Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH))) ifneq (,$(findstring 86,$(ARCH)))
...@@ -219,9 +226,9 @@ endif ...@@ -219,9 +226,9 @@ endif
endif endif
# #
# Debugging and profiling support (unless optimisations are active) # Debugging and profiling support
# #
ifneq ($(OPTIMS),1) ifeq ($(TRACE),1)
CFLAGS += -g CFLAGS += -g
endif endif
This diff is collapsed.
...@@ -202,6 +202,13 @@ AC_ARG_ENABLE(stats, ...@@ -202,6 +202,13 @@ AC_ARG_ENABLE(stats,
[ --enable-stats Enable printing of statistics (default disabled)], [ --enable-stats Enable printing of statistics (default disabled)],
[ if test x$enableval = xyes; then STATS=1; fi ]) [ if test x$enableval = xyes; then STATS=1; fi ])
dnl
dnl Trace mode
dnl
AC_ARG_ENABLE(trace,
[ --enable-trace Enable trace mode (default disabled)],
[ if test x$enableval = xyes; then TRACE=1; fi ])
dnl dnl
dnl Enable/disable optimizations dnl Enable/disable optimizations
dnl dnl
...@@ -458,6 +465,7 @@ AC_SUBST(DEFINE) ...@@ -458,6 +465,7 @@ AC_SUBST(DEFINE)
AC_SUBST(INCLUDE) AC_SUBST(INCLUDE)
AC_SUBST(DEBUG) AC_SUBST(DEBUG)
AC_SUBST(STATS) AC_SUBST(STATS)
AC_SUBST(TRACE)
AC_SUBST(OPTIMS) AC_SUBST(OPTIMS)
AC_SUBST(CSS) AC_SUBST(CSS)
...@@ -495,6 +503,7 @@ system : ${SYS} ...@@ -495,6 +503,7 @@ system : ${SYS}
architecture : ${ARCH} architecture : ${ARCH}
debug mode : ${DEBUG} debug mode : ${DEBUG}
statistics : ${STATS} statistics : ${STATS}
trace mode : ${TRACE}
optimizations : ${OPTIMS} optimizations : ${OPTIMS}
CSS decryption : ${CSS} CSS decryption : ${CSS}
need builtin getopt : ${GETOPT} need builtin getopt : ${GETOPT}
......
...@@ -66,23 +66,23 @@ ...@@ -66,23 +66,23 @@
/***************************************************************************** /*****************************************************************************
* Debugging options - define or undefine symbols * Debugging options - define or undefine symbols
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
/* General debugging support, which depends of the DEBUG define, is determined /* General trace support, which depends of the TRACE define, is determined
* in the Makefile */ * in the Makefile */
/* Modules specific debugging - this will produce a lot of output, but can be /* Modules specific debugging - this will produce a lot of output, but can be
* useful to track a bug */ * useful to track a bug */
//#define DEBUG_INTF //#define TRACE_INTF
//#define DEBUG_INPUT //#define TRACE_INPUT
//#define DEBUG_AUDIO //#define TRACE_AUDIO
#define DEBUG_VOUT #define TRACE_VOUT
#define DEBUG_VPAR #define TRACE_VPAR
/* Debugging log file - if defined, a file can be used to store all messages. If /* Trace log file - if defined, a file can be used to store all messages. If
* DEBUG_LOG_ONLY is defined, debug messages will only be printed to the log and * TRACE_LOG_ONLY is defined, debug messages will only be printed to the log and
* will not appear on the screen */ * will not appear on the screen */
#define DEBUG_LOG "vlc-debug.log" #define TRACE_LOG "vlc-trace.log"
#define DEBUG_LOG_ONLY #define TRACE_LOG_ONLY
#endif #endif
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
* when debugging, since it allows messages which would not be printed * when debugging, since it allows messages which would not be printed
* due to a crash to be printed anyway */ * due to a crash to be printed anyway */
#ifndef DEBUG #ifndef DEBUG
//#define INTF_MSG_QUEUE #define INTF_MSG_QUEUE
#endif #endif
/* Format of the header for debug messages. The arguments following this header /* Format of the header for debug messages. The arguments following this header
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* interface, such as message output. See config.h for output configuration. * interface, such as message output. See config.h for output configuration.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_msg.h,v 1.11 2001/03/21 13:42:33 sam Exp $ * $Id: intf_msg.h,v 1.12 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
* compiler extensions and print the file, the function and the line number * compiler extensions and print the file, the function and the line number
* from which they have been called. They call _intf_DbgMsg*() functions after * from which they have been called. They call _intf_DbgMsg*() functions after
* having added debugging informations. * having added debugging informations.
* Outside DEBUG mode, intf_DbgMsg* functions do nothing. * Outside trace mode, intf_DbgMsg* functions do nothing.
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #ifdef TRACE
/* DEBUG mode */ /* TRACE mode */
void _intf_DbgMsg ( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsg ( char *psz_file, char *psz_function, int i_line,
char *psz_format, ... ); char *psz_format, ... );
void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line, void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line,
...@@ -47,7 +47,7 @@ void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line, ...@@ -47,7 +47,7 @@ void _intf_DbgMsgImm ( char *psz_file, char *psz_function, int i_line,
#else #else
/* Non-DEBUG mode */ /* Non-TRACE mode */
#define intf_DbgMsg( format, args... ) #define intf_DbgMsg( format, args... )
#define intf_DbgMsgImm( format, args...) #define intf_DbgMsgImm( format, args...)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.49 2001/04/22 00:08:25 stef Exp $ * $Id: input_dvd.c,v 1.50 2001/04/27 19:29:11 massiot Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -742,7 +742,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -742,7 +742,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
for( i = 1 ; i <= vts.manager_inf.i_audio_nb ; i++ ) for( i = 1 ; i <= vts.manager_inf.i_audio_nb ; i++ )
{ {
#ifdef DEBUG
intf_WarnMsg( 1, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i, intf_WarnMsg( 1, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i,
vts.manager_inf.p_audio_attr[i-1].i_num_channels, vts.manager_inf.p_audio_attr[i-1].i_num_channels,
vts.manager_inf.p_audio_attr[i-1].i_coding_mode, vts.manager_inf.p_audio_attr[i-1].i_coding_mode,
...@@ -756,7 +755,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -756,7 +755,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
vts.manager_inf.p_audio_attr[i-1].i_sample_freq, vts.manager_inf.p_audio_attr[i-1].i_sample_freq,
vts.manager_inf.p_audio_attr[i-1].i_lang_code, vts.manager_inf.p_audio_attr[i-1].i_lang_code,
vts.manager_inf.p_audio_attr[i-1].i_caption ); vts.manager_inf.p_audio_attr[i-1].i_caption );
#endif
switch( vts.manager_inf.p_audio_attr[i-1].i_coding_mode ) switch( vts.manager_inf.p_audio_attr[i-1].i_coding_mode )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ps.c: PS demux and packet management * input_ps.c: PS demux and packet management
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ps.c,v 1.17 2001/04/22 00:08:26 stef Exp $ * $Id: input_ps.c,v 1.18 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr> * Cyril Deguet <asmax@via.ecp.fr>
...@@ -547,11 +547,14 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -547,11 +547,14 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
data_packet_t * p_data; data_packet_t * p_data;
long l_index; long l_index;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "PPacket cache not initialized" ); intf_ErrMsg( "PPacket cache not initialized" );
return NULL; return NULL;
} }
#endif
/* Safety check */ /* Safety check */
if( l_size > INPUT_MAX_PACKET_SIZE ) if( l_size > INPUT_MAX_PACKET_SIZE )
{ {
...@@ -565,10 +568,12 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -565,10 +568,12 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
/* Allocates a new packet */ /* Allocates a new packet */
if ( (p_data = malloc( sizeof(data_packet_t) )) == NULL ) if ( (p_data = malloc( sizeof(data_packet_t) )) == NULL )
{ {
intf_DbgMsg( "Out of memory" ); intf_ErrMsg( "Out of memory" );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: data packet allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: data packet allocated" );
#endif
} }
else else
{ {
...@@ -576,7 +581,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -576,7 +581,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data = p_cache->data.p_stack[ -- p_cache->data.l_index ]) if( (p_data = p_cache->data.p_stack[ -- p_cache->data.l_index ])
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the data cache" ); intf_ErrMsg( "NULL packet in the data cache" );
return NULL; return NULL;
} }
} }
...@@ -595,7 +600,9 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -595,7 +600,9 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
free( p_data ); free( p_data );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: small buffer allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: small buffer allocated" );
#endif
p_data->l_size = l_size; p_data->l_size = l_size;
} }
else else
...@@ -605,7 +612,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -605,7 +612,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data->p_buffer = p_cache->small.p_stack[l_index].p_data) if( (p_data->p_buffer = p_cache->small.p_stack[l_index].p_data)
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the small buffer cache" ); intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
...@@ -632,11 +639,13 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -632,11 +639,13 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
/* Allocates a new packet */ /* Allocates a new packet */
if ( (p_data->p_buffer = malloc( l_size )) == NULL ) if ( (p_data->p_buffer = malloc( l_size )) == NULL )
{ {
intf_DbgMsg( "Out of memory" ); intf_ErrMsg( "Out of memory" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: large buffer allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: large buffer allocated" );
#endif
p_data->l_size = l_size; p_data->l_size = l_size;
} }
else else
...@@ -646,7 +655,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache, ...@@ -646,7 +655,7 @@ static struct data_packet_s * NewPacket( void * p_packet_cache,
if( (p_data->p_buffer = p_cache->large.p_stack[l_index].p_data) if( (p_data->p_buffer = p_cache->large.p_stack[l_index].p_data)
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the small buffer cache" ); intf_ErrMsg( "NULL packet in the small buffer cache" );
free( p_data ); free( p_data );
return NULL; return NULL;
} }
...@@ -683,11 +692,14 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -683,11 +692,14 @@ static pes_packet_t * NewPES( void * p_packet_cache )
packet_cache_t * p_cache; packet_cache_t * p_cache;
pes_packet_t * p_pes; pes_packet_t * p_pes;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return NULL; return NULL;
} }
#endif
/* Checks whether the PES cache is empty */ /* Checks whether the PES cache is empty */
if( p_cache->pes.l_index == 0 ) if( p_cache->pes.l_index == 0 )
{ {
...@@ -697,7 +709,9 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -697,7 +709,9 @@ static pes_packet_t * NewPES( void * p_packet_cache )
intf_DbgMsg( "Out of memory" ); intf_DbgMsg( "Out of memory" );
return NULL; return NULL;
} }
intf_WarnMsg( 1, "PS input: PES packet allocated" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: PES packet allocated" );
#endif
} }
else else
{ {
...@@ -705,7 +719,7 @@ static pes_packet_t * NewPES( void * p_packet_cache ) ...@@ -705,7 +719,7 @@ static pes_packet_t * NewPES( void * p_packet_cache )
if( (p_pes = p_cache->pes.p_stack[ -- p_cache->pes.l_index ]) if( (p_pes = p_cache->pes.p_stack[ -- p_cache->pes.l_index ])
== NULL ) == NULL )
{ {
intf_DbgMsg( "NULL packet in the data cache" ); intf_ErrMsg( "NULL packet in the data cache" );
return NULL; return NULL;
} }
} }
...@@ -727,11 +741,13 @@ static void DeletePacket( void * p_packet_cache, ...@@ -727,11 +741,13 @@ static void DeletePacket( void * p_packet_cache,
{ {
packet_cache_t * p_cache; packet_cache_t * p_cache;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return; return;
} }
#endif
ASSERT( p_data ); ASSERT( p_data );
...@@ -755,7 +771,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -755,7 +771,9 @@ static void DeletePacket( void * p_packet_cache,
{ {
ASSERT( p_data->p_buffer ); ASSERT( p_data->p_buffer );
free( p_data->p_buffer ); free( p_data->p_buffer );
intf_WarnMsg( 1, "PS input: small buffer freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: small buffer freed" );
#endif
} }
} }
else else
...@@ -772,7 +790,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -772,7 +790,9 @@ static void DeletePacket( void * p_packet_cache,
{ {
ASSERT( p_data->p_buffer ); ASSERT( p_data->p_buffer );
free( p_data->p_buffer ); free( p_data->p_buffer );
intf_WarnMsg( 1, "PS input: large buffer freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: large buffer freed" );
#endif
} }
} }
} }
...@@ -781,7 +801,9 @@ static void DeletePacket( void * p_packet_cache, ...@@ -781,7 +801,9 @@ static void DeletePacket( void * p_packet_cache,
/* Cache full: the packet must be freed */ /* Cache full: the packet must be freed */
free( p_data->p_buffer ); free( p_data->p_buffer );
free( p_data ); free( p_data );
intf_WarnMsg( 1, "PS input: data packet freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: data packet freed" );
#endif
} }
} }
...@@ -795,11 +817,13 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes ) ...@@ -795,11 +817,13 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes )
data_packet_t * p_data; data_packet_t * p_data;
data_packet_t * p_next; data_packet_t * p_next;
#ifdef DEBUG
if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL ) if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
{ {
intf_ErrMsg( "Packet cache not initialized" ); intf_ErrMsg( "Packet cache not initialized" );
return; return;
} }
#endif
ASSERT( p_pes); ASSERT( p_pes);
...@@ -822,7 +846,9 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes ) ...@@ -822,7 +846,9 @@ static void DeletePES( void * p_packet_cache, pes_packet_t * p_pes )
{ {
/* Cache full: the packet must be freed */ /* Cache full: the packet must be freed */
free( p_pes ); free( p_pes );
intf_WarnMsg( 1, "PS input: PES packet freed" ); #ifdef TRACE_INPUT
intf_DbgMsg( "PS input: PES packet freed" );
#endif
} }
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_x11.c: X11 video output display method * vout_x11.c: X11 video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_x11.c,v 1.20 2001/04/21 22:49:24 sam Exp $ * $Id: vout_x11.c,v 1.21 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -532,13 +532,11 @@ static int vout_Manage( vout_thread_t *p_vout ) ...@@ -532,13 +532,11 @@ static int vout_Manage( vout_thread_t *p_vout )
X11TogglePointer( p_vout ); X11TogglePointer( p_vout );
} }
} }
#ifdef DEBUG
/* Other event */ /* Other event */
else else
{ {
intf_DbgMsg( "vout: unhandled event %d received", xevent.type ); intf_WarnMsg( 1, "vout: unhandled event %d received", xevent.type );
} }
#endif
} }
/* ClientMessage event - only WM_PROTOCOLS with WM_DELETE_WINDOW data /* ClientMessage event - only WM_PROTOCOLS with WM_DELETE_WINDOW data
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_xvideo.c: Xvideo video output display method * vout_xvideo.c: Xvideo video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: vout_xvideo.c,v 1.11 2001/04/26 03:55:44 sam Exp $ * $Id: vout_xvideo.c,v 1.12 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Shane Harper <shanegh@optusnet.com.au> * Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -483,14 +483,12 @@ static int vout_Manage( vout_thread_t *p_vout ) ...@@ -483,14 +483,12 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->p_sys->b_mouse_pointer_visible = 1; p_vout->p_sys->b_mouse_pointer_visible = 1;
XVideoSetMousePointer( p_vout ); XVideoSetMousePointer( p_vout );
} }
#ifdef DEBUG
/* Other event */ /* Other event */
else else
{ {
intf_DbgMsg( "%p -> unhandled event type %d received", intf_WarnMsg( 1, "%p -> unhandled event type %d received",
p_vout, xevent.type ); p_vout, xevent.type );
} }
#endif
} }
/* Handle events for YUV video output sub-window */ /* Handle events for YUV video output sub-window */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input_programs.c,v 1.50 2001/04/22 00:08:26 stef Exp $ * $Id: input_programs.c,v 1.51 2001/04/27 19:29:11 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -613,7 +613,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -613,7 +613,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
return -1; return -1;
} }
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT
intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id ); intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id );
#endif #endif
...@@ -711,7 +711,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -711,7 +711,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
return -1; return -1;
} }
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT
intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id ); intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id );
#endif #endif
...@@ -744,7 +744,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -744,7 +744,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
if( p_input->stream.pp_selected_es == NULL ) if( p_input->stream.pp_selected_es == NULL )
{ {
#ifdef DEBUG_INPUT #ifdef TRACE_INPUT