From: Sam Hocevar Date: Fri, 27 Apr 2001 16:08:26 +0000 (+0000) Subject: * Fixed the continuous 'seeking position' bug in network mode. X-Git-Tag: 0.2.73~10 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c0138ec5ec4fd09b4421797c0edfaf8a56951d42;p=vlc * Fixed the continuous 'seeking position' bug in network mode. * rc interface plugin for vlc control through /dev/stdin courtesy of Peter Surda . * Support for `ts://foo:42' style input source: vlc ts://vls.via.ecp.fr:1234 vlc ts://vls.via.ecp.fr vlc ts:vls vlc ts:vls:4321 As a side effect, the Gnome and Gtk "network input" buttons work. --- diff --git a/AUTHORS b/AUTHORS index ee28029b48..4a0585cfc6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -39,6 +39,10 @@ N: Nilmoni Deb E: ndeb@ece.cmu.edu D: Minor configure.in and Makefile.in fixes +N: Cyril Deguet +E: asmax@via.ecp.fr +D: PS input packet allocator + N: Colin Delacroix E: colin@zoy.org C: colin @@ -163,3 +167,7 @@ C: benny D: MPEG system input D: network input +N: Peter Surda +E: shurdeek@panorama.sth.ac.at +D: rc plugin for vlc control through /dev/stdin + diff --git a/ChangeLog b/ChangeLog index 91b0fa143a..5a0b2539f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ HEAD + * Fixed the continuous 'seeking position' bug in network mode. + * Support for `ts://foo:42' style input source. + * rc interface plugin for vlc control through /dev/stdin courtesy + of Peter Surda . * Misc XVideo fixes (aspect ratio, mouse pointer, blue areas). * AC3 decoder enhancements. * Fixed an alignment issue in the bitstream callback. diff --git a/Makefile b/Makefile index 7c452856db..f79a6b9aa5 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \ macosx/macosx mga/mga \ motion/motion motion/motionmmx motion/motionmmxext \ mpeg/es mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \ - text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx + text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx # # C Objects diff --git a/TODO b/TODO index 9e1512a2c8..ef0874c730 100644 --- a/TODO +++ b/TODO @@ -128,7 +128,7 @@ Urgency: Critical Description: Multi-angle multi-language support Some DVDs have several languages encoded in the same video stream, we need to properly parse them. -Status: Todo +Status: Done 22 Apr 2001 (stef) Task: 0x4f Difficulty: Hard @@ -145,7 +145,7 @@ Urgency: Important Description: Write stream zones support For random access we need to know where stream descriptors are valid and reside (essentially DVD plugin). -> Meuuh -Status: Todo +Status: Done (stef) Task: 0x4d Difficulty: Hard @@ -185,7 +185,7 @@ Urgency: Important Description: Write a new buffer allocator Avoid malloc()s by reusing the recently released packets. More information -> Meuuh -Status: Todo +Status: Done 16 Apr 2001 (asmax) Task: 0x48 Difficulty: Hard diff --git a/configure b/configure index 70bcd8ec97..5dccb3eb7f 100755 --- a/configure +++ b/configure @@ -15,6 +15,8 @@ ac_help="$ac_help --disable-dummy dummy module (default enabled)" ac_help="$ac_help --disable-null Null module (default enabled)" +ac_help="$ac_help + --disable-rc rc module (default enabled)" ac_help="$ac_help --disable-ppro Disable PentiumPro optimizations (default enabled for x86)" ac_help="$ac_help @@ -599,7 +601,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:603: checking host system type" >&5 +echo "configure:605: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -626,7 +628,7 @@ VLC_CODENAME=Ourumov echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:630: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:632: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -655,7 +657,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:659: checking for $ac_word" >&5 +echo "configure:661: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -685,7 +687,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:689: checking for $ac_word" >&5 +echo "configure:691: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -736,7 +738,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:740: checking for $ac_word" >&5 +echo "configure:742: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -768,7 +770,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:774: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -779,12 +781,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 783 "configure" +#line 785 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -810,12 +812,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:816: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:819: checking whether we are using GNU C" >&5 +echo "configure:821: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -824,7 +826,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -843,7 +845,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:849: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -875,7 +877,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:879: checking how to run the C preprocessor" >&5 +echo "configure:881: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -890,13 +892,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -907,13 +909,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -924,13 +926,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -967,7 +969,7 @@ echo "$ac_t""$CPP" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:971: checking for a BSD compatible install" >&5 +echo "configure:973: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1021,12 +1023,12 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1025: checking for working const" >&5 +echo "configure:1027: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1096,14 +1098,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1100: checking whether byte ordering is bigendian" >&5 +echo "configure:1102: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1114,11 +1116,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1129,7 +1131,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1149,7 +1151,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1189,12 +1191,12 @@ fi for ac_func in gettimeofday select strerror strtod strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1193: checking for $ac_func" >&5 +echo "configure:1195: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1244,12 +1246,12 @@ done for ac_func in setenv putenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1248: checking for $ac_func" >&5 +echo "configure:1250: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1297,12 +1299,12 @@ fi done echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1301: checking for connect" >&5 +echo "configure:1303: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1343,7 +1345,7 @@ if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1347: checking for connect in -lsocket" >&5 +echo "configure:1349: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1351,7 +1353,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1385,12 +1387,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1389: checking for gethostbyname" >&5 +echo "configure:1391: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1431,7 +1433,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1435: checking for gethostbyname in -lnsl" >&5 +echo "configure:1437: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1439,7 +1441,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1473,12 +1475,12 @@ fi fi echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 -echo "configure:1477: checking for nanosleep" >&5 +echo "configure:1479: checking for nanosleep" >&5 if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_nanosleep=yes" else @@ -1519,7 +1521,7 @@ if eval "test \"`echo '$ac_cv_func_'nanosleep`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:1523: checking for nanosleep in -lrt" >&5 +echo "configure:1525: checking for nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1527,7 +1529,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1557,7 +1559,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:1561: checking for nanosleep in -lposix4" >&5 +echo "configure:1563: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1565,7 +1567,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1603,12 +1605,12 @@ fi for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1607: checking for $ac_func" >&5 +echo "configure:1609: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1656,12 +1658,12 @@ fi done echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:1660: checking for inet_aton" >&5 +echo "configure:1662: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -1702,7 +1704,7 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:1706: checking for inet_aton in -lresolv" >&5 +echo "configure:1708: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1710,7 +1712,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1746,12 +1748,12 @@ fi for ac_func in vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1750: checking for $ac_func" >&5 +echo "configure:1752: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1800,12 +1802,12 @@ done echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:1804: checking for getopt_long" >&5 +echo "configure:1806: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -1850,7 +1852,7 @@ else echo "$ac_t""no" 1>&6 # FreeBSD has a gnugetopt library for this: echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6 -echo "configure:1854: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:1856: checking for getopt_long in -lgnugetopt" >&5 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1858,7 +1860,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1901,17 +1903,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1905: checking for $ac_hdr" >&5 +echo "configure:1907: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1940,12 +1942,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1944: checking for $ac_func" >&5 +echo "configure:1946: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1993,7 +1995,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1997: checking for working mmap" >&5 +echo "configure:1999: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,7 +2003,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2164,12 +2166,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2168: checking return type of signal handlers" >&5 +echo "configure:2170: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2186,7 +2188,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2205,7 +2207,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2209: checking for dlopen in -ldl" >&5 +echo "configure:2211: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2213,7 +2215,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2245,7 +2247,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:2249: checking for pow in -lm" >&5 +echo "configure:2251: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2253,7 +2255,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2285,9 +2287,9 @@ else fi echo $ac_n "checking for old style FreeBSD -pthread flag""... $ac_c" 1>&6 -echo "configure:2289: checking for old style FreeBSD -pthread flag" >&5 +echo "configure:2291: checking for old style FreeBSD -pthread flag" >&5 cat > conftest.$ac_ext <&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2307: checking for pthread_create in -lpthread" >&5 +echo "configure:2309: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2311,7 +2313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2346,7 +2348,7 @@ fi rm -f conftest* echo $ac_n "checking for thread_create in -lthreads""... $ac_c" 1>&6 -echo "configure:2350: checking for thread_create in -lthreads" >&5 +echo "configure:2352: checking for thread_create in -lthreads" >&5 ac_lib_var=`echo threads'_'thread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2354,7 +2356,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2391,17 +2393,17 @@ for ac_hdr in stddef.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2395: checking for $ac_hdr" >&5 +echo "configure:2397: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2431,17 +2433,17 @@ for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2435: checking for $ac_hdr" >&5 +echo "configure:2437: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2471,17 +2473,17 @@ for ac_hdr in sys/sockio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2475: checking for $ac_hdr" >&5 +echo "configure:2477: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2511,17 +2513,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2515: checking for $ac_hdr" >&5 +echo "configure:2517: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2551,17 +2553,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2555: checking for $ac_hdr" >&5 +echo "configure:2557: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2591,17 +2593,17 @@ for ac_hdr in dlfcn.h image.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2595: checking for $ac_hdr" >&5 +echo "configure:2597: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2631,17 +2633,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_hdr" >&5 +echo "configure:2637: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2671,17 +2673,17 @@ for ac_hdr in machine/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2675: checking for $ac_hdr" >&5 +echo "configure:2677: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2712,17 +2714,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2716: checking for $ac_hdr" >&5 +echo "configure:2718: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2753,9 +2755,9 @@ save_CFLAGS=$CFLAGS CFLAGS="${CFLAGS} -Wall -Werror" echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:2757: checking for ntohl in sys/param.h" >&5 +echo "configure:2759: checking for ntohl in sys/param.h" >&5 cat > conftest.$ac_ext < void foo() { int meuh; ntohl(meuh); } @@ -2763,7 +2765,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define NTOHL_IN_SYS_PARAM_H 1 @@ -2780,16 +2782,16 @@ rm -f conftest* CFLAGS="${CFLAGS} -rdynamic -Wall -Werror" echo $ac_n "checking if \$CC groks -rdynamic without complaining too much""... $ac_c" 1>&6 -echo "configure:2784: checking if \$CC groks -rdynamic without complaining too much" >&5 +echo "configure:2786: checking if \$CC groks -rdynamic without complaining too much" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LCFLAGS="${LCFLAGS} -rdynamic" echo "$ac_t""yes" 1>&6 @@ -2804,9 +2806,9 @@ rm -f conftest* CFLAGS=$save_CFLAGS echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2808: checking for boolean_t in sys/types.h" >&5 +echo "configure:2810: checking for boolean_t in sys/types.h" >&5 cat > conftest.$ac_ext < void quux() { boolean_t foo; } @@ -2814,7 +2816,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define BOOLEAN_T_IN_SYS_TYPES_H 1 @@ -2829,9 +2831,9 @@ else fi rm -f conftest* echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:2833: checking for boolean_t in pthread.h" >&5 +echo "configure:2835: checking for boolean_t in pthread.h" >&5 cat > conftest.$ac_ext < void quux() { boolean_t foo; } @@ -2839,7 +2841,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define BOOLEAN_T_IN_PTHREAD_H 1 @@ -2855,12 +2857,12 @@ fi rm -f conftest* echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2859: checking for working const" >&5 +echo "configure:2861: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2930,12 +2932,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2934: checking for ANSI C header files" >&5 +echo "configure:2936: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2943,7 +2945,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2960,7 +2962,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2978,7 +2980,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2999,7 +3001,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3010,7 +3012,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3034,12 +3036,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3038: checking for size_t" >&5 +echo "configure:3040: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3067,12 +3069,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3071: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3073: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3081,7 +3083,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3115,17 +3117,17 @@ for ac_hdr in sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3119: checking for $ac_hdr" >&5 +echo "configure:3121: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3151,17 +3153,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3155: checking for $ac_hdr" >&5 +echo "configure:3157: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3188,7 +3190,7 @@ fi done cat > conftest.$ac_ext < EOF @@ -3229,6 +3231,15 @@ fi if test x$enable_null != xno; then BUILTINS="${BUILTINS} null"; fi +# Check whether --enable-rc or --disable-rc was given. +if test "${enable_rc+set}" = set; then + enableval="$enable_rc" + : +fi + +if test x$enable_rc != xno; then + BUILTINS="${BUILTINS} rc"; fi + # Check whether --enable-ppro or --disable-ppro was given. if test "${enable_ppro+set}" = set; then enableval="$enable_ppro" @@ -3323,7 +3334,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3327: checking for $ac_word" >&5 +echo "configure:3338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3388,17 +3399,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3392: checking for $ac_hdr" >&5 +echo "configure:3403: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3469,17 +3480,17 @@ if test "${with_sdl+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3473: checking for $ac_hdr" >&5 +echo "configure:3484: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3517,17 +3528,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3521: checking for $ac_hdr" >&5 +echo "configure:3532: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3621,7 +3632,7 @@ if test x$enable_gtk != xno; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3625: checking for $ac_word" >&5 +echo "configure:3636: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3681,17 +3692,17 @@ if test x$enable_x11 != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3685: checking for $ac_hdr" >&5 +echo "configure:3696: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3743,17 +3754,17 @@ if test x$enable_xvideo != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3747: checking for $ac_hdr" >&5 +echo "configure:3758: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3791,17 +3802,17 @@ if test "${enable_alsa+set}" = set; then enableval="$enable_alsa" 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 "configure:3795: checking for sys/asoundlib.h" >&5 +echo "configure:3806: checking for sys/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3818,7 +3829,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:3822: checking for main in -lasound" >&5 +echo "configure:3833: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3826,14 +3837,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index d6f22459b8..ca1736cc80 100644 --- a/configure.in +++ b/configure.in @@ -143,6 +143,14 @@ AC_ARG_ENABLE(null, if test x$enable_null != xno; then BUILTINS="${BUILTINS} null"; fi +dnl +dnl rc plugin +dnl +AC_ARG_ENABLE(rc, + [ --disable-rc rc module (default enabled)]) +if test x$enable_rc != xno; then + BUILTINS="${BUILTINS} rc"; fi + dnl dnl PentiumPro acceleration dnl diff --git a/doc/vlc.1 b/doc/vlc.1 index 1c78371ad0..19d16baa69 100644 --- a/doc/vlc.1 +++ b/doc/vlc.1 @@ -130,7 +130,7 @@ Print help and exit. .B \-H, \-\-longhelp Print long help and exit. .TP -.B \-v, \-\-version +.B \-\-version Output version information and exit. .SH PARAMETERS .B vlc diff --git a/include/defs.h.in b/include/defs.h.in index 47164ea2c1..4a17a5dbee 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -52,12 +52,18 @@ /* Define if you have the vasprintf function. */ #undef HAVE_VASPRINTF -/* Define if you have the header file. */ -#undef HAVE_COREAUDIO_AUDIOHARDWARE_H +/* Define if you have the header file. */ +#undef HAVE_CARBON_CARBON_H /* Define if you have the header file. */ #undef HAVE_SDL_SDL_H +/* Define if you have the header file. */ +#undef HAVE_X11_XLIB_H + +/* Define if you have the header file. */ +#undef HAVE_X11_EXTENSIONS_XV_H + /* Define if you have the header file. */ #undef HAVE_ARPA_INET_H diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index b389359008..16d4cf6061 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -2,7 +2,7 @@ * alsa.c : alsa plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: alsa.c,v 1.8 2001/03/21 13:42:33 sam Exp $ + * $Id: alsa.c,v 1.9 2001/04/27 16:08:26 sam Exp $ * * Authors: Henri Fallon * @@ -30,11 +30,6 @@ #include "defs.h" -#include -#include -#include /* for alsa :) */ -#include -#include #include /* malloc(), free() */ #include "config.h" @@ -42,10 +37,6 @@ #include "threads.h" #include "mtime.h" -#include "interface.h" - -#include "main.h" - #include "modules.h" /***************************************************************************** diff --git a/plugins/gtk/intf_gtk.c b/plugins/gtk/intf_gtk.c index e9c85b7660..97ea5e1746 100644 --- a/plugins/gtk/intf_gtk.c +++ b/plugins/gtk/intf_gtk.c @@ -2,7 +2,7 @@ * intf_gtk.c: Gtk+ interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_gtk.c,v 1.13 2001/04/13 01:49:22 henri Exp $ + * $Id: intf_gtk.c,v 1.14 2001/04/27 16:08:26 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -409,7 +409,7 @@ static gint GtkManage( gpointer p_data ) } /* Manage the slider */ - if( p_intf->p_input != NULL ) + if( p_intf->p_input != NULL && p_intf->p_input->stream.b_seekable ) { float newvalue = p_intf->p_sys->p_adj->value; diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c index 8409ca95f6..0ed311ea89 100644 --- a/plugins/mpeg/input_ts.c +++ b/plugins/mpeg/input_ts.c @@ -2,7 +2,7 @@ * input_ts.c: TS demux and netlist management ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input_ts.c,v 1.14 2001/04/13 05:36:12 stef Exp $ + * $Id: input_ts.c,v 1.15 2001/04/27 16:08:26 sam Exp $ * * Authors: Henri Fallon * @@ -66,10 +66,11 @@ * Local prototypes *****************************************************************************/ static int TSProbe ( probedata_t * ); -static int TSRead ( struct input_thread_s *, - data_packet_t * p_packets[INPUT_READ_ONCE] ); static void TSInit ( struct input_thread_s * ); +static void TSFakeOpen ( struct input_thread_s * ); static void TSEnd ( struct input_thread_s * ); +static int TSRead ( struct input_thread_s *, + data_packet_t * p_packets[INPUT_READ_ONCE] ); /***************************************************************************** * Functions exported as capabilities. They are declared as static so that @@ -80,13 +81,8 @@ void _M( input_getfunctions )( function_list_t * p_function_list ) #define input p_function_list->functions.input p_function_list->pf_probe = TSProbe; input.pf_init = TSInit; -#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) - input.pf_open = input_NetworkOpen; - input.pf_close = input_NetworkClose; -#else - input.pf_open = input_FileOpen; - input.pf_close = input_FileClose; -#endif + input.pf_open = TSFakeOpen; + input.pf_close = NULL; /* Will be set by pf_open */ input.pf_end = TSEnd; input.pf_set_area = NULL; input.pf_read = TSRead; @@ -116,6 +112,12 @@ static int TSProbe( probedata_t * p_data ) return( 999 ); } + if( ( strlen(psz_name) > 3 ) && !strncasecmp( psz_name, "ts:", 3 ) ) + { + /* If the user specified "ts:" then it's probably a network stream */ + return( 999 ); + } + if( ( strlen(psz_name) > 5 ) && !strncasecmp( psz_name, "file:", 5 ) ) { /* If the user specified "file:" then it's probably a file */ @@ -188,6 +190,30 @@ static void TSInit( input_thread_t * p_input ) } +/***************************************************************************** + * TSFakeOpen: open the stream and set pf_close + *****************************************************************************/ +void TSFakeOpen( input_thread_t * p_input ) +{ +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) + char *psz_name = p_input->p_source; + + if( ( strlen(psz_name) > 3 ) && !strncasecmp( psz_name, "ts:", 3 ) ) + { + /* If the user specified "ts:" he wants a network stream */ + p_input->pf_open = input_NetworkOpen; + p_input->pf_close = input_NetworkClose; + } + else +#endif + { + p_input->pf_open = input_FileOpen; + p_input->pf_close = input_FileClose; + } + + p_input->pf_open( p_input ); +} + /***************************************************************************** * TSEnd: frees unused data *****************************************************************************/ @@ -231,7 +257,7 @@ static int TSRead( input_thread_t * p_input, s_wait.tv_usec = 0; /* Reset pointer table */ - memset( pp_packets, 0, INPUT_READ_ONCE*sizeof(data_packet_t *) ); + memset( pp_packets, 0, INPUT_READ_ONCE * sizeof(data_packet_t *) ); /* Get iovecs */ p_iovec = input_NetlistGetiovec( p_input->p_method_data ); @@ -247,7 +273,7 @@ static int TSRead( input_thread_t * p_input, if( i_data == -1 ) { - intf_ErrMsg( "TS input : Error in select : %s", strerror(errno) ); + intf_ErrMsg( "input error: TS select error (%s)", strerror(errno) ); return( -1 ); } @@ -257,7 +283,7 @@ static int TSRead( input_thread_t * p_input, if( i_read == -1 ) { - intf_ErrMsg( "TS input : Could not readv" ); + intf_ErrMsg( "input error: TS readv error" ); return( -1 ); } @@ -268,7 +294,9 @@ static int TSRead( input_thread_t * p_input, for( i_loop=0; i_loop * TS_PACKET_SIZE < i_read; i_loop++ ) { if( pp_packets[i_loop]->p_buffer[0] != 0x47 ) - intf_ErrMsg( "TS input : Bad TS Packet (starcode != 0x47)." ); + intf_ErrMsg( "input error: bad TS packet (starts with " + "0x%.2x, should be 0x47)", + pp_packets[i_loop]->p_buffer[0] ); } } return 0; diff --git a/plugins/qt/intf_qt.cpp b/plugins/qt/intf_qt.cpp index 856107bad5..584b199288 100644 --- a/plugins/qt/intf_qt.cpp +++ b/plugins/qt/intf_qt.cpp @@ -2,7 +2,7 @@ * intf_qt.cpp: Qt interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: intf_qt.cpp,v 1.4 2001/04/16 07:40:11 sam Exp $ + * $Id: intf_qt.cpp,v 1.5 2001/04/27 16:08:26 sam Exp $ * * Authors: Samuel Hocevar * @@ -465,7 +465,7 @@ void IntfWindow::About( void ) void IntfWindow::Manage( void ) { /* Manage the slider */ - if( p_intf->p_input != NULL ) + if( p_intf->p_input != NULL && p_intf->p_input->stream.b_seekable ) { int i_value = p_slider->value(); diff --git a/plugins/text/Makefile b/plugins/text/Makefile index 06a844eed0..c7603247e9 100644 --- a/plugins/text/Makefile +++ b/plugins/text/Makefile @@ -7,9 +7,13 @@ # Objects # -PLUGIN_C = ncurses.o vout_ncurses.o -BUILTIN_C = $(PLUGIN_C:%.o=BUILTIN_%.o) +PLUGIN_NCURSES = ncurses.o intf_ncurses.o +PLUGIN_RC = rc.o intf_rc.o +BUILTIN_NCURSES = $(PLUGIN_NCURSES:%.o=BUILTIN_%.o) +BUILTIN_RC = $(PLUGIN_RC:%.o=BUILTIN_%.o) +PLUGIN_C = $(PLUGIN_NCURSES) $(PLUGIN_RC) +BUILTIN_C = $(BUILTIN_NCURSES) $(BUILTIN_RC) ALL_OBJ = $(PLUGIN_C) $(BUILTIN_C) # @@ -22,9 +26,15 @@ include ../../Makefile.modules # Real targets # -../../lib/ncurses.so: $(PLUGIN_C) +../../lib/ncurses.so: $(PLUGIN_NCURSES) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES) -../../lib/ncurses.a: $(BUILTIN_C) +../../lib/ncurses.a: $(BUILTIN_NCURSES) + ar r $@ $^ + +../../lib/rc.so: $(PLUGIN_RC) + $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) + +../../lib/rc.a: $(BUILTIN_RC) ar r $@ $^ diff --git a/plugins/text/intf_rc.c b/plugins/text/intf_rc.c new file mode 100644 index 0000000000..b2d76423fe --- /dev/null +++ b/plugins/text/intf_rc.c @@ -0,0 +1,266 @@ +/***************************************************************************** + * intf_rc.cpp: rc interface + ***************************************************************************** + * Copyright (C) 1999-2001 VideoLAN + * $Id: intf_rc.cpp,v 0.1 2001/04/27 shurdeek + * + * Authors: Peter Surda + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +#define MODULE_NAME rc +#include "modules_inner.h" + +/***************************************************************************** + * Preamble + *****************************************************************************/ +#include "defs.h" + +#include /* ENOMEM */ +#include /* free() */ +#include /* strerror() */ +#include +#include +#include +#include +#include + +#include "config.h" +#include "common.h" +#include "threads.h" +#include "mtime.h" +#include "tests.h" +#include "modules.h" + +#include "stream_control.h" +#include "input_ext-intf.h" + +#include "intf_msg.h" +#include "intf_playlist.h" +#include "interface.h" + +#include "video.h" +#include "video_output.h" + +#include "main.h" + + +/***************************************************************************** + * intf_sys_t: description and status of rc interface + *****************************************************************************/ +typedef struct intf_sys_s +{ + vlc_mutex_t change_lock; + +} intf_sys_t; + +/***************************************************************************** + * Local prototypes. + *****************************************************************************/ +static int intf_Probe ( probedata_t *p_data ); +static int intf_Open ( intf_thread_t *p_intf ); +static void intf_Close ( intf_thread_t *p_intf ); +static void intf_Run ( intf_thread_t *p_intf ); + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +void _M( intf_getfunctions )( function_list_t * p_function_list ) +{ + p_function_list->pf_probe = intf_Probe; + p_function_list->functions.intf.pf_open = intf_Open; + p_function_list->functions.intf.pf_close = intf_Close; + p_function_list->functions.intf.pf_run = intf_Run; +} + +/***************************************************************************** + * intf_Probe: probe the interface and return a score + ***************************************************************************** + * This function tries to initialize rc and returns a score to the + * plugin manager so that it can select the best plugin. + *****************************************************************************/ +static int intf_Probe( probedata_t *p_data ) +{ + if( TestMethod( INTF_METHOD_VAR, "rc" ) ) + { + return( 999 ); + } + + return( 2 ); +} + +/***************************************************************************** + * intf_Open: initialize and create stuff + *****************************************************************************/ +static int intf_Open( intf_thread_t *p_intf ) +{ + /* Non-buffered stdout */ + setvbuf( stdout, (char *)NULL, _IOLBF, 0 ); + + /* Allocate instance and initialize some members */ + p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); + if( p_intf->p_sys == NULL ) + { + intf_ErrMsg( "intf error: %s", strerror(ENOMEM) ); + return( 1 ); + } + + return( 0 ); +} + +/***************************************************************************** + * intf_Close: destroy interface stuff + *****************************************************************************/ +static void intf_Close( intf_thread_t *p_intf ) +{ + /* Destroy structure */ + free( p_intf->p_sys ); +} + +/***************************************************************************** + * intf_Run: rc thread + ***************************************************************************** + * This part of the interface is in a separate thread so that we can call + * exec() from within it without annoying the rest of the program. + *****************************************************************************/ +static void intf_Run( intf_thread_t *p_intf ) +{ + char p_cmd[ 32 ]; + int i_cmd_pos; + boolean_t b_complete = 0; + + int i_dummy; + off_t i_oldpos = 0; + off_t i_newpos; + fd_set fds; /* stdin changed? */ + struct timeval tv; /* how long to wait */ + + double f_cpos; + double f_ratio = 1; + + while( !p_intf->b_die ) + { + if( p_intf->p_input != NULL ) + { + /* Get position */ +#define S p_intf->p_input->stream + if( S.i_mux_rate ) + { + f_ratio = 1.0 / ( 50 * S.i_mux_rate ); + i_newpos = S.p_selected_area->i_tell * f_ratio; + + if( i_oldpos != i_newpos ) + { + i_oldpos = i_newpos; + intf_Msg( "rc: pos: %li s / %li s", (long int)i_newpos, + (long int)( f_ratio * + S.p_selected_area->i_size ) ); + } + } +#undef S + + b_complete = 0; + i_cmd_pos = 0; + + /* Check stdin */ + tv.tv_sec = 0; + tv.tv_usec = 50000; + FD_ZERO( &fds ); + FD_SET( STDIN_FILENO, &fds ); + + if( select( 32, &fds, NULL, NULL, &tv ) ) + { + while( i_cmd_pos < 32 + && read( STDIN_FILENO, p_cmd + i_cmd_pos, 1 ) > 0 + && p_cmd[ i_cmd_pos ] != '\r' + && p_cmd[ i_cmd_pos ] != '\n' ) + { + i_cmd_pos++; + } + + if( i_cmd_pos == 31 || p_cmd[ i_cmd_pos ] == '\r' + || p_cmd[ i_cmd_pos ] == '\n' ) + { + p_cmd[ i_cmd_pos ] = 0; + b_complete = 1; + } + } + + /* Is there something to do? */ + if( b_complete == 1 ) + { + switch( p_cmd[ 0 ] ) + { + case 'p': + case 'P': + input_SetStatus( p_intf->p_input, INPUT_STATUS_PAUSE ); + break; + + case 'f': + case 'F': + p_intf->p_input->p_default_vout->i_changes |= + VOUT_FULLSCREEN_CHANGE; + break; + + case 'm': + case 'M': +#if 0 + double picratio = p_intf->p_input->p_default_vout->i_width + / p_intf->p_input->p_default_vout->i_height; + if (picratio + p_intf->p_input->p_default_vout->i_width=800 + p_intf->p_input->p_default_vout->i_changes |= + VOUT_FULLSCREEN_CHANGE; +#endif + break; + + case 's': + case 'S': + ; + break; + + case 'q': + case 'Q': + p_intf->b_die = 1; + break; + + case 'r': + case 'R': + for( i_dummy = 1; i_dummy < 32 && p_cmd[ i_dummy ] >= '0' + && p_cmd[ i_dummy ] <= '9'; ++i_dummy ) + { + ; + } + + p_cmd[ i_dummy ] = 0; + f_cpos = atof( p_cmd + 1 ); + input_Seek( p_intf->p_input, (off_t) (f_cpos / f_ratio) ); + /* rcreseek(f_cpos); */ + break; + + default: + intf_Msg( "rc: unknown command: %s", p_cmd ); + break; + } + } + } + + p_intf->pf_manage( p_intf ); + msleep( INTF_IDLE_SLEEP ); + } +} + diff --git a/plugins/text/rc.c b/plugins/text/rc.c new file mode 100644 index 0000000000..d43c96c71d --- /dev/null +++ b/plugins/text/rc.c @@ -0,0 +1,111 @@ +/***************************************************************************** + * rc.cpp : stdin/stdout plugin for vlc + ***************************************************************************** + * Copyright (C) 2001 VideoLAN + * $Id: rc.cpp,v 0.1 2001/04/27 shurdeek + * + * Authors: Peter Surda + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +#define MODULE_NAME rc +#include "modules_inner.h" + +/***************************************************************************** + * Preamble + *****************************************************************************/ +#include "defs.h" + +#include /* malloc(), free() */ + +#include "config.h" +#include "common.h" /* boolean_t, byte_t */ +#include "threads.h" +#include "mtime.h" + +#include "modules.h" + +/***************************************************************************** + * Build configuration tree. + *****************************************************************************/ +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for rc module" ) + ADD_COMMENT( "Ha, ha -- nothing to configure yet" ) +MODULE_CONFIG_END + +/***************************************************************************** + * Capabilities defined in the other files. + *****************************************************************************/ +void _M( intf_getfunctions )( function_list_t * p_function_list ); + +/***************************************************************************** + * InitModule: get the module structure and configuration. + ***************************************************************************** + * We have to fill psz_name, psz_longname and psz_version. These variables + * will be strdup()ed later by the main application because the module can + * be unloaded later to save memory, and we want to be able to access this + * data even after the module has been unloaded. + *****************************************************************************/ +MODULE_INIT +{ + p_module->psz_name = MODULE_STRING; + p_module->psz_longname = "rc interface module"; + p_module->psz_version = VERSION; + + p_module->i_capabilities = MODULE_CAPABILITY_NULL + | MODULE_CAPABILITY_INTF; + + return( 0 ); +} + +/***************************************************************************** + * ActivateModule: set the module to an usable state. + ***************************************************************************** + * This function fills the capability functions and the configuration + * structure. Once ActivateModule() has been called, the i_usage can + * be set to 0 and calls to NeedModule() be made to increment it. To unload + * the module, one has to wait until i_usage == 0 and call DeactivateModule(). + *****************************************************************************/ +MODULE_ACTIVATE +{ + p_module->p_functions = + ( module_functions_t * )malloc( sizeof( module_functions_t ) ); + if( p_module->p_functions == NULL ) + { + return( -1 ); + } + + _M( intf_getfunctions )( &p_module->p_functions->intf ); + + p_module->p_config = p_config; + + return( 0 ); +} + +/***************************************************************************** + * DeactivateModule: make sure the module can be unloaded. + ***************************************************************************** + * This function must only be called when i_usage == 0. If it successfully + * returns, i_usage can be set to -1 and the module unloaded. Be careful to + * lock usage_lock during the whole process. + *****************************************************************************/ +MODULE_DEACTIVATE +{ + free( p_module->p_functions ); + + return( 0 ); +} + diff --git a/src/input/input.c b/src/input/input.c index 5a8dbed070..5c54651881 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -4,7 +4,7 @@ * decoders. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input.c,v 1.99 2001/04/22 00:08:26 stef Exp $ + * $Id: input.c,v 1.100 2001/04/27 16:08:26 sam Exp $ * * Authors: Christophe Massiot * @@ -508,7 +508,7 @@ void input_FileOpen( input_thread_t * p_input ) p_input->stream.p_selected_area->i_tell = 0; vlc_mutex_unlock( &p_input->stream.stream_lock ); - intf_Msg( "input: opening %s", p_input->p_source ); + intf_Msg( "input: opening file `%s'", p_input->p_source ); if( (p_input->i_handle = open( psz_name, /*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) ) { @@ -524,7 +524,7 @@ void input_FileOpen( input_thread_t * p_input ) *****************************************************************************/ void input_FileClose( input_thread_t * p_input ) { - intf_Msg( "input: closing %s", p_input->p_source ); + intf_Msg( "input: closing file `%s'", p_input->p_source ); close( p_input->i_handle ); return; @@ -537,18 +537,68 @@ void input_FileClose( input_thread_t * p_input ) *****************************************************************************/ void input_NetworkOpen( input_thread_t * p_input ) { - - int i_option_value, i_port; - struct sockaddr_in s_socket; + char *psz_server = NULL; + int i_port = 0; + + int i_opt; + struct sockaddr_in sock; boolean_t b_broadcast; - /* FIXME : we don't handle channels for the moment */ - /* Get the remote server */ - if( p_input->p_source == NULL ) + if( p_input->p_source != NULL ) + { + psz_server = p_input->p_source; + + /* Skip the protocol name */ + while( *psz_server && *psz_server != ':' ) + { + psz_server++; + } + + /* Skip the "://" part */ + while( *psz_server && (*psz_server == ':' || *psz_server == '/') ) + { + psz_server++; + } + + /* Found a server name */ + if( *psz_server ) + { + char *psz_port = psz_server; + + /* Skip the hostname part */ + while( *psz_port && *psz_port != ':' ) + { + psz_port++; + } + + /* Found a port name */ + if( *psz_port ) + { + /* Replace ':' with '\0' */ + *psz_port = '\0'; + psz_port++; + + i_port = atoi( psz_port ); + } + } + else + { + psz_server = NULL; + } + } + + /* Check that we got a valid server */ + if( psz_server == NULL ) + { + psz_server = main_GetPszVariable( INPUT_SERVER_VAR, + INPUT_SERVER_DEFAULT ); + } + + /* Check that we got a valid port */ + if( i_port == 0 ) { - p_input->p_source = main_GetPszVariable( INPUT_SERVER_VAR, - INPUT_SERVER_DEFAULT ); + i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT ); } /* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0) @@ -556,17 +606,17 @@ void input_NetworkOpen( input_thread_t * p_input ) p_input->i_handle = socket( AF_INET, SOCK_DGRAM, 0 ); if( p_input->i_handle == -1 ) { - intf_ErrMsg("NetworkOpen : can't create socket : %s", strerror(errno)); + intf_ErrMsg("input error: can't create socket : %s", strerror(errno)); p_input->b_error = 1; return; } /* We may want to reuse an already used socket */ - i_option_value = 1; + i_opt = 1; if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_REUSEADDR, - &i_option_value,sizeof( i_option_value ) ) == -1 ) + &i_opt, sizeof( i_opt ) ) == -1 ) { - intf_ErrMsg("NetworkOpen : can't configure socket (SO_REUSEADDR: %s)", + intf_ErrMsg("input error: can't configure socket (SO_REUSEADDR: %s)", strerror(errno)); close( p_input->i_handle ); p_input->b_error = 1; @@ -575,11 +625,11 @@ void input_NetworkOpen( input_thread_t * p_input ) /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid * packet loss caused by scheduling problems */ - i_option_value = 524288; - if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF, &i_option_value, - sizeof( i_option_value ) ) == -1 ) + i_opt = 0x80000; + if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF, + &i_opt, sizeof( i_opt ) ) == -1 ) { - intf_ErrMsg("NetworkOpen : can't configure socket (SO_RCVBUF: %s)", + intf_ErrMsg("input error: can't configure socket (SO_RCVBUF: %s)", strerror(errno)); close( p_input->i_handle ); p_input->b_error = 1; @@ -588,13 +638,11 @@ void input_NetworkOpen( input_thread_t * p_input ) /* Get details about what we are supposed to do */ b_broadcast = (boolean_t)main_GetIntVariable( INPUT_BROADCAST_VAR, 0 ); - i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT ); - /* TODO : here deal with channel stufs */ + /* TODO : here deal with channel stuff */ /* Build the local socket */ - if ( network_BuildLocalAddr( &s_socket, i_port, b_broadcast ) - == -1 ) + if ( network_BuildLocalAddr( &sock, i_port, b_broadcast ) == -1 ) { close( p_input->i_handle ); p_input->b_error = 1; @@ -602,18 +650,17 @@ void input_NetworkOpen( input_thread_t * p_input ) } /* Bind it */ - if( bind( p_input->i_handle, (struct sockaddr *)&s_socket, - sizeof( s_socket ) ) < 0 ) + if( bind( p_input->i_handle, (struct sockaddr *)&sock, + sizeof( sock ) ) < 0 ) { - intf_ErrMsg("NetworkOpen: can't bind socket (%s)", strerror(errno)); + intf_ErrMsg("input error: can't bind socket (%s)", strerror(errno)); close( p_input->i_handle ); p_input->b_error = 1; return; } /* Build socket for remote connection */ - if ( network_BuildRemoteAddr( &s_socket, p_input->p_source ) - == -1 ) + if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 ) { close( p_input->i_handle ); p_input->b_error = 1; @@ -621,10 +668,10 @@ void input_NetworkOpen( input_thread_t * p_input ) } /* And connect it ... should we really connect ? */ - if( connect( p_input->i_handle, (struct sockaddr *) &s_socket, - sizeof( s_socket ) ) == (-1) ) + if( connect( p_input->i_handle, (struct sockaddr *) &sock, + sizeof( sock ) ) == (-1) ) { - intf_ErrMsg("NetworkOpen: can't connect socket" ); + intf_ErrMsg("input error: can't connect socket" ); close( p_input->i_handle ); p_input->b_error = 1; return; @@ -633,6 +680,7 @@ void input_NetworkOpen( input_thread_t * p_input ) /* We can't pace control, but FIXME : bug in meuuh's code to sync PCR * with the server. */ p_input->stream.b_pace_control = 1; + p_input->stream.b_seekable = 0; return; } diff --git a/src/input/input_ext-intf.c b/src/input/input_ext-intf.c index 765ceefa4b..2cd82879ab 100644 --- a/src/input/input_ext-intf.c +++ b/src/input/input_ext-intf.c @@ -2,7 +2,7 @@ * input_ext-intf.c: services to the interface ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input_ext-intf.c,v 1.20 2001/04/08 07:24:47 stef Exp $ + * $Id: input_ext-intf.c,v 1.21 2001/04/27 16:08:26 sam Exp $ * * Authors: Christophe Massiot * @@ -147,11 +147,11 @@ void input_Seek( input_thread_t * p_input, off_t i_position ) vlc_mutex_lock( &p_input->stream.stream_lock ); p_input->stream.p_selected_area->i_seek = i_position; - intf_Msg( "input: seeking position %lld/%lld (%s/%s)", i_position, - p_input->stream.p_selected_area->i_size, - input_OffsetToTime( p_input, psz_time1, i_position ), - input_OffsetToTime( p_input, psz_time2, - p_input->stream.p_selected_area->i_size ) ); + intf_WarnMsg( 1, "input: seeking position %lld/%lld (%s/%s)", i_position, + p_input->stream.p_selected_area->i_size, + input_OffsetToTime( p_input, psz_time1, i_position ), + input_OffsetToTime( p_input, psz_time2, + p_input->stream.p_selected_area->i_size ) ); vlc_cond_signal( &p_input->stream.stream_wait ); vlc_mutex_unlock( &p_input->stream.stream_lock ); diff --git a/src/misc/netutils.c b/src/misc/netutils.c index 5484b3fc6b..047cd46ff9 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -2,7 +2,7 @@ * netutils.c: various network functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: netutils.c,v 1.25 2001/04/17 20:43:41 marcari Exp $ + * $Id: netutils.c,v 1.26 2001/04/27 16:08:26 sam Exp $ * * Authors: Vincent Seguin * Benoit Steiner @@ -45,7 +45,7 @@ #include /* ioctl() */ #endif -#if defined (HAVE_NET_IF_H) +#ifdef HAVE_NET_IF_H #include /* interface (arch-dependent) */ #endif @@ -180,12 +180,12 @@ int network_ChannelCreate( void ) { /* Even when BSD are supported, BeOS is not likely to be supported, so * I prefer to put it apart */ -#ifdef SYS_BEOS +#if defined( SYS_BEOS ) intf_ErrMsg( "error: channel changing is not yet supported under BeOS" ); return( 1 ); -#else + +#elif defined( SYS_LINUX ) /* FIXME : channels handling only work for linux */ -#ifdef SYS_LINUX /* Allocate structure */ p_main->p_channel = malloc( sizeof( input_channel_t ) ); if( p_main->p_channel == NULL ) @@ -200,11 +200,12 @@ int network_ChannelCreate( void ) intf_Msg("Channels initialized\n"); return( 0 ); + #else intf_ErrMsg( "error : channel changing only works with linux yest" ); return( 1 ); -#endif /* SYS_LINUX */ -#endif /* SYS_BEOS */ + +#endif } /***************************************************************************** @@ -221,11 +222,11 @@ int network_ChannelCreate( void ) int network_ChannelJoin( int i_channel_id ) { /* I still prefer to put BeOS a bit apart */ -#ifdef SYS_BEOS +#if defined( SYS_BEOS ) intf_ErrMsg( "Channels are not yet supported under BeOS" ); return( -1 ); -#else -#ifdef SYS_LINUX + +#elif defined( SYS_LINUX ) int i_socket_cl; int i_fromlen; struct ifreq s_interface; @@ -392,9 +393,11 @@ int network_ChannelJoin( int i_channel_id ) close( i_socket_cl ); return( 0 ); -#else /* SYS_LINUX */ - intf_ErrMsg( "Channel only work under linux yet" ); -#endif /* SYS_LINUX */ -#endif /* SYS_BEOS */ +#else + intf_ErrMsg( "Channels only work under linux yet" ); + return( -1 ); + +#endif } +