Commit 9bc87bff authored by Stéphane Borel's avatar Stéphane Borel

. Ajout de la date dans les warning si le mode debug est activ�

. Modification du configure pour remmettre le x11 par d�faut, et pour
montrer que ppro et mmx sont par d�fauts maintenant.
parent 40b8684f
...@@ -12,19 +12,19 @@ ac_help= ...@@ -12,19 +12,19 @@ ac_help=
ac_default_prefix=/usr/local ac_default_prefix=/usr/local
# Any additions from configure.in: # Any additions from configure.in:
ac_help="$ac_help ac_help="$ac_help
--enable-ppro Enable PentiumPro optimizations (default is no)" --disable-ppro Disable PentiumPro optimizations (default enabled for x86)"
ac_help="$ac_help ac_help="$ac_help
--enable-mmx Enable MMX optimizations (default is no)" --disable-mmx Disable MMX optimizations (default enabled for x86)"
ac_help="$ac_help ac_help="$ac_help
--enable-debug Enable debug mode (default is no)" --enable-debug Enable debug mode (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-stats Enable printing of statistics (default is no)" --enable-stats Enable printing of statistics (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-optimizations Enable compiler optimizations (default enabled)" --disable-optimizations Disable compiler optimizations (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-dummy dummy audio and video support (default enabled)" --disable-dummy dummy audio and video support (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-dsp Linux /dev/dsp support (default enabled)" --disable-dsp Linux /dev/dsp support (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-esd Esound library support (default disabled)" --enable-esd Esound library support (default disabled)"
ac_help="$ac_help ac_help="$ac_help
...@@ -38,9 +38,9 @@ ac_help="$ac_help ...@@ -38,9 +38,9 @@ ac_help="$ac_help
ac_help="$ac_help ac_help="$ac_help
--enable-gnome Gnome support (default disabled)" --enable-gnome Gnome support (default disabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-x11 X11 support (default enabled)" --disable-x11 X11 support (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-alsa Alsa sound drivers supprt (Only for linux) (default disabled)" --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)"
# Initialize some variables set by options. # Initialize some variables set by options.
# The variables have the same names as the options, with # The variables have the same names as the options, with
...@@ -3069,11 +3069,10 @@ fi ...@@ -3069,11 +3069,10 @@ fi
# Check whether --enable-mmx or --disable-mmx was given. # Check whether --enable-mmx or --disable-mmx was given.
if test "${enable_mmx+set}" = set; then if test "${enable_mmx+set}" = set; then
enableval="$enable_mmx" enableval="$enable_mmx"
if test x`echo $ARCH | cut -b3-4` = x86 ; then if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi; fi :
else
if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi
fi fi
if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then if test x$enableval != xno; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ; fi
# Check whether --enable-debug or --disable-debug was given. # Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then if test "${enable_debug+set}" = set; then
enableval="$enable_debug" enableval="$enable_debug"
...@@ -3156,9 +3155,10 @@ fi ...@@ -3156,9 +3155,10 @@ fi
# Check whether --enable-x11 or --disable-x11 was given. # Check whether --enable-x11 or --disable-x11 was given.
if test "${enable_x11+set}" = set; then if test "${enable_x11+set}" = set; then
enableval="$enable_x11" enableval="$enable_x11"
if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi :
fi fi
if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi
# Check whether --enable-alsa or --disable-alsa was given. # Check whether --enable-alsa or --disable-alsa was given.
if test "${enable_alsa+set}" = set; then if test "${enable_alsa+set}" = set; then
enableval="$enable_alsa" enableval="$enable_alsa"
......
...@@ -67,21 +67,20 @@ PLUGINS=${PLUGINS}"yuv "; ...@@ -67,21 +67,20 @@ PLUGINS=${PLUGINS}"yuv ";
ARCH=${host_cpu} ARCH=${host_cpu}
AC_ARG_ENABLE(ppro, AC_ARG_ENABLE(ppro,
[ --enable-ppro Enable PentiumPro optimizations (default is no)], [ --disable-ppro Disable PentiumPro optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ], [ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
[ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ]) [ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
AC_ARG_ENABLE(mmx, AC_ARG_ENABLE(mmx,
[ --enable-mmx Enable MMX optimizations (default is no)], [ --disable-mmx Disable MMX optimizations (default enabled for x86)])
[ if test x`echo $ARCH | cut -b3-4` = x86 ; then if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi; fi ], if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then if test x$enableval != xno; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ; fi
[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ] )
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
[ --enable-debug Enable debug mode (default is no)], [ --enable-debug Enable debug mode (default disabled)],
[ if test x$enableval = xyes; then DEBUG=1; fi ]) [ if test x$enableval = xyes; then DEBUG=1; fi ])
AC_ARG_ENABLE(stats, AC_ARG_ENABLE(stats,
[ --enable-stats Enable printing of statistics (default is no)], [ --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 ])
AC_ARG_ENABLE(optimizations, AC_ARG_ENABLE(optimizations,
[ --enable-optimizations Enable compiler optimizations (default enabled)], [ --disable-optimizations Disable compiler optimizations (default enabled)],
[ if test x$enableval = xno; then OPTIMS=0; fi ], [ if test x$enableval = xno; then OPTIMS=0; fi ],
[ OPTIMS=1 ]) [ OPTIMS=1 ])
...@@ -95,10 +94,10 @@ dnl default case ...@@ -95,10 +94,10 @@ dnl default case
else else
AC_ARG_ENABLE(dummy, AC_ARG_ENABLE(dummy,
[ --enable-dummy dummy audio and video support (default enabled)]) [ --disable-dummy dummy audio and video support (default enabled)])
if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi
AC_ARG_ENABLE(dsp, AC_ARG_ENABLE(dsp,
[ --enable-dsp Linux /dev/dsp support (default enabled)]) [ --disable-dsp Linux /dev/dsp support (default enabled)])
if test x$enable_dsp != xno; then PLUGINS=${PLUGINS}"dsp "; fi if test x$enable_dsp != xno; then PLUGINS=${PLUGINS}"dsp "; fi
AC_ARG_ENABLE(esd, AC_ARG_ENABLE(esd,
[ --enable-esd Esound library support (default disabled)], [ --enable-esd Esound library support (default disabled)],
...@@ -119,10 +118,10 @@ AC_ARG_ENABLE(gnome, ...@@ -119,10 +118,10 @@ AC_ARG_ENABLE(gnome,
[ --enable-gnome Gnome support (default disabled)], [ --enable-gnome Gnome support (default disabled)],
[if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi]) [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi])
AC_ARG_ENABLE(x11, AC_ARG_ENABLE(x11,
[ --enable-x11 X11 support (default enabled)], [ --disable-x11 X11 support (default enabled)])
[if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi]) if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi
AC_ARG_ENABLE(alsa, AC_ARG_ENABLE(alsa,
[ --enable-alsa Alsa sound drivers supprt (Only for linux) (default disabled)], [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)],
[if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi]) [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
fi fi
......
...@@ -102,7 +102,6 @@ typedef struct intf_msg_s ...@@ -102,7 +102,6 @@ typedef struct intf_msg_s
* dummy integer is used to fill it. */ * dummy integer is used to fill it. */
int i_dummy; /* unused filler */ int i_dummy; /* unused filler */
#endif #endif
// int i_warning_level;
} intf_msg_t; } intf_msg_t;
/***************************************************************************** /*****************************************************************************
...@@ -415,6 +414,9 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a ...@@ -415,6 +414,9 @@ static void QueueMsg( intf_msg_t *p_msg, int i_type, char *psz_format, va_list a
*/ */
p_msg_item->i_type = i_type; p_msg_item->i_type = i_type;
p_msg_item->psz_msg = psz_str; p_msg_item->psz_msg = psz_str;
#ifdef DEBUG
p_msg_item->date = mdate();
#endif
#ifdef INTF_MSG_QUEUE /*......................................... queue mode */ #ifdef INTF_MSG_QUEUE /*......................................... queue mode */
vlc_mutex_unlock( &p_msg->lock ); /* give lock back */ vlc_mutex_unlock( &p_msg->lock ); /* give lock back */
...@@ -464,9 +466,7 @@ static void QueueDbgMsg(intf_msg_t *p_msg, char *psz_file, char *psz_function, ...@@ -464,9 +466,7 @@ static void QueueDbgMsg(intf_msg_t *p_msg, char *psz_file, char *psz_function,
vlc_mutex_lock( &p_msg->lock ); /* get lock */ vlc_mutex_lock( &p_msg->lock ); /* get lock */
if( p_msg->i_count == INTF_MSG_QSIZE ) /* flush queue if needed */ if( p_msg->i_count == INTF_MSG_QSIZE ) /* flush queue if needed */
{ {
#ifdef DEBUG /* in debug mode, queue overflow causes a warning */
fprintf(stderr, "warning: message queue overflow\n" ); fprintf(stderr, "warning: message queue overflow\n" );
#endif
FlushLockedMsg( p_msg ); FlushLockedMsg( p_msg );
} }
p_msg_item = p_msg->msg + p_msg->i_count++; /* select message */ p_msg_item = p_msg->msg + p_msg->i_count++; /* select message */
...@@ -539,7 +539,10 @@ static void PrintMsg( intf_msg_item_t *p_msg ) ...@@ -539,7 +539,10 @@ static void PrintMsg( intf_msg_item_t *p_msg )
break; break;
case INTF_MSG_WARN: /* Warning message */ case INTF_MSG_WARN: /* Warning message */
asprintf( &psz_msg, "%s", p_msg->psz_msg ); mstrtime( psz_date, p_msg->date );
asprintf( &psz_msg, "(%s) %s",
psz_date, p_msg->psz_msg );
break; break;
case INTF_MSG_INTF: /* interface messages */ case INTF_MSG_INTF: /* interface messages */
......
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