Commit 2ba056f2 authored by Sam Hocevar's avatar Sam Hocevar

 * X11 output works again. It's just the output, but it works; I now need
   to clean the code and add event handling.
parent 79b46154
...@@ -40,7 +40,7 @@ ac_help="$ac_help ...@@ -40,7 +40,7 @@ ac_help="$ac_help
ac_help="$ac_help ac_help="$ac_help
--disable-gnome Gnome support (default enabled)" --disable-gnome Gnome support (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-x11 X11 support (default disabled)" --disable-x11 X11 support (default enabled)"
ac_help="$ac_help ac_help="$ac_help
--enable-alsa Alsa sound drivers support (Only for linux) (default disabled)" --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)"
...@@ -3494,29 +3494,30 @@ if test "${enable_gnome+set}" = set; then ...@@ -3494,29 +3494,30 @@ if test "${enable_gnome+set}" = set; then
fi fi
if test x$enable_gnome != xno; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi if test x$enable_gnome != xno; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi
# Check whether --enable-x11 or --disable-x11 was given. # Check whether --enable-gnome or --disable-gnome was given.
if test "${enable_x11+set}" = set; then if test "${enable_gnome+set}" = set; then
enableval="$enable_x11" enableval="$enable_gnome"
if test x$enable_x11 = xyes; 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"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
echo "configure:3510: checking for sys/asoundlib.h" >&5 echo "configure:3511: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3515 "configure" #line 3516 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3533,7 +3534,7 @@ fi ...@@ -3533,7 +3534,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:3537: checking for main in -lasound" >&5 echo "configure:3538: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -3541,14 +3542,14 @@ else ...@@ -3541,14 +3542,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3545 "configure" #line 3546 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
......
...@@ -187,9 +187,9 @@ AC_ARG_WITH(glide, ...@@ -187,9 +187,9 @@ AC_ARG_WITH(glide,
AC_ARG_ENABLE(gnome, AC_ARG_ENABLE(gnome,
[ --disable-gnome Gnome support (default enabled)]) [ --disable-gnome Gnome support (default enabled)])
if test x$enable_gnome != xno; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi if test x$enable_gnome != xno; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi
AC_ARG_ENABLE(x11, AC_ARG_ENABLE(gnome,
[ --enable-x11 X11 support (default disabled)], [ --disable-x11 X11 support (default enabled)])
[if test x$enable_x11 = xyes; 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 support (Only for linux) (default disabled)], [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)],
......
...@@ -123,7 +123,7 @@ static int vout_Probe( probedata_t *p_data ) ...@@ -123,7 +123,7 @@ static int vout_Probe( probedata_t *p_data )
return( 999 ); return( 999 );
} }
return( 40 ); return( 100 );
} }
/***************************************************************************** /*****************************************************************************
......
This diff is collapsed.
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