diff options
| -rw-r--r-- | Changes | 7 | ||||
| -rw-r--r-- | common/capture.c | 18 | ||||
| -rw-r--r-- | common/sound.c | 4 | ||||
| -rwxr-xr-x | configure | 188 | ||||
| -rw-r--r-- | console/fbtv.c | 28 | ||||
| -rw-r--r-- | console/ftp.c | 4 | ||||
| -rw-r--r-- | console/matrox.c | 5 | ||||
| -rw-r--r-- | console/scantv.c | 2 | ||||
| -rw-r--r-- | console/showriff.c | 8 | ||||
| -rw-r--r-- | console/webcam.c | 4 | ||||
| -rw-r--r-- | libng/plugins/drv0-v4l2.c | 1 | ||||
| -rw-r--r-- | libng/writefile.c | 9 | ||||
| -rw-r--r-- | vbistuff/ntsc-cc.c | 18 | ||||
| -rw-r--r-- | x11/Subdir.mk | 1 | ||||
| -rw-r--r-- | x11/xt.c | 8 | ||||
| -rw-r--r-- | xawtv.spec | 2 |
16 files changed, 189 insertions, 118 deletions
@@ -1,4 +1,11 @@ +3.95 +==== + + * misc minor fixes collected over time. + * make it build with gcc4. + + 3.91 ==== diff --git a/common/capture.c b/common/capture.c index 4396a24..a0b574c 100644 --- a/common/capture.c +++ b/common/capture.c @@ -606,7 +606,7 @@ int movie_grab_put_video(struct movie_handle *h, struct ng_video_buf **ret) { struct ng_video_buf *buf; - int expected; + int expected,rc; if (debug > 1) fprintf(stderr,"grab_put_video\n"); @@ -639,7 +639,7 @@ movie_grab_put_video(struct movie_handle *h, struct ng_video_buf **ret) } h->frames++; h->vts = buf->info.ts; - buf->info.seq = h->seq++; + buf->info.seq = h->seq; /* return a pointer to the frame if requested */ if (NULL != ret) { @@ -648,13 +648,15 @@ movie_grab_put_video(struct movie_handle *h, struct ng_video_buf **ret) } /* put into fifo */ - if (h->cthreads) { - if (0 != fifo_put(&h->cfifo,buf)) - ng_release_video_buf(buf); - } else { - if (0 != fifo_put(&h->vfifo,buf)) - ng_release_video_buf(buf); + if (h->cthreads) + rc = fifo_put(&h->cfifo,buf); + else + rc = fifo_put(&h->vfifo,buf); + if (0 != rc) { + ng_release_video_buf(buf); + return h->frames; } + h->seq++; /* feedback */ movie_print_timestamps(h); diff --git a/common/sound.c b/common/sound.c index 490d3f2..ae1e042 100644 --- a/common/sound.c +++ b/common/sound.c @@ -13,8 +13,8 @@ void oss_levels(struct ng_audio_buf *buf, int *left, int *right) { int lmax,rmax,i,level; - signed char *s = buf->data; - unsigned char *u = buf->data; + signed char *s = (signed char*) buf->data; + unsigned char *u = (unsigned char*) buf->data; lmax = 0; rmax = 0; @@ -972,7 +972,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -1955,7 +1955,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2013,7 +2014,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2129,7 +2131,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2183,7 +2186,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2228,7 +2232,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2272,7 +2277,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2456,7 +2462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2514,7 +2521,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2585,7 +2593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2629,7 +2638,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3154,7 +3164,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3324,7 +3335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3399,7 +3411,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3589,7 +3602,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3663,7 +3677,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3742,7 +3757,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3810,7 +3826,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3872,7 +3889,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3939,7 +3957,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4007,7 +4026,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4049,12 +4069,9 @@ fi - -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 +echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4147,7 +4164,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4221,7 +4238,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4281,15 +4299,10 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -4337,7 +4350,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4388,7 +4402,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4464,7 +4479,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4519,7 +4535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4587,7 +4604,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4695,7 +4713,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4759,7 +4778,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4827,7 +4847,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4931,7 +4952,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4995,7 +5017,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5092,7 +5115,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5156,7 +5180,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5253,7 +5278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5317,7 +5343,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5396,7 +5423,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5509,7 +5537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5586,7 +5615,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5664,7 +5694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5742,7 +5773,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5820,7 +5852,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5900,7 +5933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5977,7 +6011,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6059,7 +6094,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6132,7 +6168,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6205,7 +6242,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6278,7 +6316,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6350,7 +6389,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6423,7 +6463,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6496,7 +6537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6574,7 +6616,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6651,7 +6694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6725,7 +6769,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7643,6 +7688,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -7681,12 +7731,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/console/fbtv.c b/console/fbtv.c index 30007c0..7961358 100644 --- a/console/fbtv.c +++ b/console/fbtv.c @@ -187,7 +187,6 @@ static struct KEYTAB keytab[] = { #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB)) -static char *snapbase; static char default_title[128] = "???"; static char message[128] = ""; @@ -195,12 +194,23 @@ static char message[128] = ""; /* framebuffer stuff */ static void -linear_palette(int bit) +linear_palette(int r, int g, int b) { - int i, size = 256 >> (8 - bit); + int i, size; + size = 256 >> (8 - r); for (i = 0; i < size; i++) - red[i] = green[i] = blue[i] = (unsigned short)(65535.0 + red[i] = (unsigned short)(65535.0 + * pow(i/(size - 1.0), fbgamma)); + + size = 256 >> (8 - g); + for (i = 0; i < size; i++) + green[i] = (unsigned short)(65535.0 + * pow(i/(size - 1.0), fbgamma)); + + size = 256 >> (8 - b); + for (i = 0; i < size; i++) + blue[i] = (unsigned short)(65535.0 * pow(i/(size - 1.0), fbgamma)); } @@ -232,7 +242,7 @@ fb_initcolors(int fd, int gray) switch (fb_var.bits_per_pixel) { case 8: if (gray) { - linear_palette(8); + linear_palette(8,8,8); x11_native_format = VIDEO_GRAY; } else { dither_palette(5,9,5); @@ -242,7 +252,9 @@ fb_initcolors(int fd, int gray) case 15: case 16: if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR) - linear_palette(5); + linear_palette(fb_var.red.length, + fb_var.green.length, + fb_var.blue.length); #if BYTE_ORDER == BIG_ENDIAN x11_native_format = (fb_var.green.length == 6) ? VIDEO_RGB16_BE : VIDEO_RGB15_BE; @@ -253,7 +265,7 @@ fb_initcolors(int fd, int gray) break; case 24: if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR) - linear_palette(8); + linear_palette(8,8,8); #if BYTE_ORDER == BIG_ENDIAN x11_native_format = VIDEO_RGB24; #else @@ -262,7 +274,7 @@ fb_initcolors(int fd, int gray) break; case 32: if (fb_fix.visual == FB_VISUAL_DIRECTCOLOR) - linear_palette(8); + linear_palette(8,8,8); #if BYTE_ORDER == BIG_ENDIAN x11_native_format = VIDEO_RGB32; #else diff --git a/console/ftp.c b/console/ftp.c index b9720da..dd08991 100644 --- a/console/ftp.c +++ b/console/ftp.c @@ -186,7 +186,7 @@ ftp_recv(struct ftp_state *s) s->connected = 0; } if (NULL != strstr(p,"Not connected")) { - if (ftp_connected) + if (!ftp_connected(s)) fprintf(stderr,"ftp: lost connection\n"); s->connected = 0; } @@ -236,7 +236,7 @@ ftp_connect(struct ftp_state *s, char *host, char *user, char *pass, char *dir) /* login */ ftp_send(s,3,"user",user,pass); if (230 != ftp_recv(s)) { - if (!ftp_connected) + if (!ftp_connected(s)) continue; fprintf(stderr,"ftp: login incorrect\n"); exit(1); diff --git a/console/matrox.c b/console/matrox.c index 4e17f1a..e9011a7 100644 --- a/console/matrox.c +++ b/console/matrox.c @@ -5,6 +5,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#include <inttypes.h> #include <sys/ioctl.h> #include <sys/mman.h> @@ -24,7 +25,7 @@ void (*gfx_scaler_on)(int offscreen, int pitch, int width, int height, void (*gfx_scaler_off)(void); static unsigned char *bmmio; -static unsigned long *mmio; +static uint32_t *mmio; static void wrio4(int adr, unsigned long val) @@ -227,6 +228,6 @@ gfx_init(int fd) off = (unsigned long)fb_fix.mmio_start - ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); bmmio += off; - mmio = (unsigned long*)bmmio; + mmio = (uint32_t*)bmmio; return 0; } diff --git a/console/scantv.c b/console/scantv.c index 204b4c6..617eb13 100644 --- a/console/scantv.c +++ b/console/scantv.c @@ -16,10 +16,10 @@ #include <pthread.h> /* xawtv */ -#include "channel.h" #include "frequencies.h" #include "grab-ng.h" #include "commands.h" +#include "channel.h" #include "vbi-data.h" diff --git a/console/showriff.c b/console/showriff.c index aa9d093..1279425 100644 --- a/console/showriff.c +++ b/console/showriff.c @@ -335,9 +335,9 @@ static void dump_jpeg(unsigned char *buf, int len) static unsigned char* off_t_to_char(off_t val, int base, int len) { - static const char digit[] = "0123456789abcdef"; - static char outbuf[32]; - char *p = outbuf + sizeof(outbuf); + static const unsigned char digit[] = "0123456789abcdef"; + static unsigned char outbuf[32]; + unsigned char *p = outbuf + sizeof(outbuf); int i; *(--p) = 0; @@ -375,7 +375,7 @@ static boolean ProcessChunk(FILE* f, size_t filepos, size_t filesize, FOURCC DesiredTag, int RekDepth, DWORD* chunksize) { - char buf[BUFSIZE]; + unsigned char buf[BUFSIZE]; int buflen; char tagstr[5]; /* FOURCC of chunk converted to string */ FOURCC chunkid; /* read FOURCC of chunk */ diff --git a/console/webcam.c b/console/webcam.c index ace70e9..37c836f 100644 --- a/console/webcam.c +++ b/console/webcam.c @@ -62,7 +62,7 @@ char *grab_norm = NULL; /* jpeg stuff */ static int -write_file(int fd, char *data, int width, int height) +write_file(int fd, unsigned char *data, int width, int height) { struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; @@ -415,7 +415,7 @@ add_text(char *image, int width, int height) { time_t t; struct tm *tm; - unsigned char line[MSG_MAXLEN+1],*ptr; + char line[MSG_MAXLEN+1],*ptr; int i,x,y,f,len; time(&t); diff --git a/libng/plugins/drv0-v4l2.c b/libng/plugins/drv0-v4l2.c index 3954123..b8eb3f4 100644 --- a/libng/plugins/drv0-v4l2.c +++ b/libng/plugins/drv0-v4l2.c @@ -342,6 +342,7 @@ v4l2_add_attr(struct v4l2_handle *h, struct v4l2_queryctrl *ctl, h->attr[h->nattr].choices = v4l2_menu(h->fd, ctl); break; default: + memset(h->attr+h->nattr,0,sizeof(struct ng_attribute)*2); return; } } else { diff --git a/libng/writefile.c b/libng/writefile.c index 92516e9..92f6404 100644 --- a/libng/writefile.c +++ b/libng/writefile.c @@ -18,6 +18,7 @@ #include <fcntl.h> #include <jpeglib.h> #include <pthread.h> +#include <inttypes.h> #include <sys/types.h> #include <sys/param.h> #include "byteswap.h" @@ -178,10 +179,10 @@ int write_pgm(char *filename, struct ng_video_buf *buf) /* Copyright (C) by Heiko Eissfeldt */ -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; -typedef unsigned long FOURCC; /* a four character code */ +typedef uint8_t BYTE; +typedef uint16_t WORD; +typedef uint32_t DWORD; +typedef uint32_t FOURCC; /* a four character code */ /* flags for 'wFormatTag' field of WAVEFORMAT */ #define WAVE_FORMAT_PCM 1 diff --git a/vbistuff/ntsc-cc.c b/vbistuff/ntsc-cc.c index 78b6cc9..8a4effb 100644 --- a/vbistuff/ntsc-cc.c +++ b/vbistuff/ntsc-cc.c @@ -220,7 +220,9 @@ static int XDSdecode(int data) { infoptr = info[mode][type]; memcpy(info[mode][type],newinfo[mode][type],length+1); - printf("\33[33m%%"); + if (!plain) + printf("\33[33m"); + putchar('%'); switch ((mode<<8) + type) { case 0x0101: @@ -273,7 +275,9 @@ static int XDSdecode(int data) printf(" DESC: %s",infoptr); break; } - printf("\33[0m\n"); + if (!plain) + printf("\33[0m"); + putchar('\n'); fflush(stdout); } mode = 0; type = 0; @@ -335,7 +339,10 @@ static int webtv_check(char * buf,int len) if(!strncmp(buf,temp,4)) { buf[5]=0; - printf("\33[35mWEBTV: %s\33[0m\n",buf-nbytes-1); + if (!plain) + printf("\33[35mWEBTV: %s\33[0m\n",buf-nbytes-1); + else + printf("WEBTV: %s\n",buf-nbytes-1); fflush(stdout); } return 0; @@ -441,7 +448,10 @@ static int CCdecode(int data) for (y=0;y<keywords;y++) if (!strncasecmp(keyword[y], ccbuf[ccmode]+x, strlen(keyword[y]))) printf("\a"); - printf("%s\33[m\n",ccbuf[ccmode]); + if (!plain) + printf("%s\33[m\n",ccbuf[ccmode]); + else + printf("%s\n",ccbuf[ccmode]); fflush(stdout); /* FALL */ case 0x2A: //text restart diff --git a/x11/Subdir.mk b/x11/Subdir.mk index 7f853f9..15de044 100644 --- a/x11/Subdir.mk +++ b/x11/Subdir.mk @@ -112,6 +112,7 @@ x11/propwatch : LDLIBS += $(ATHENA_LIBS) # linker flags x11/xawtv : LDFLAGS := $(DLFLAGS) x11/motv : LDFLAGS := $(DLFLAGS) +x11/mtt : LDFLAGS := $(DLFLAGS) x11/v4lctl : LDFLAGS := $(DLFLAGS) x11/pia : LDFLAGS := $(DLFLAGS) @@ -2124,14 +2124,6 @@ int xt_vm_randr_input_init(Display *dpy) if (debug) fprintf(stderr,"xt: checking for randr extention ...\n"); xfree_randr_init(dpy); -#if 0 - if (fs_width && fs_height && !args.vidmode) { - if (debug) - fprintf(stderr,"fullscreen mode configured (%dx%d), " - "VidMode extention enabled\n",fs_width,fs_height); - args.vidmode = 1; - } -#endif if (debug) fprintf(stderr,"xt: checking for vidmode extention ...\n"); xfree_vm_init(dpy); @@ -1,7 +1,7 @@ Name: xawtv Group: Applications/Multimedia Autoreqprov: on -Version: 3.94 +Version: 3.95 Release: 0 License: GPL Summary: v4l applications |