diff -Nru bs1770gain-0.5.1/aclocal.m4 bs1770gain-0.5.2/aclocal.m4 --- bs1770gain-0.5.1/aclocal.m4 2018-10-19 08:26:18.000000000 +0000 +++ bs1770gain-0.5.2/aclocal.m4 2019-01-23 08:44:35.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,12 +51,12 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,7 +118,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,7 +201,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -392,7 +392,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -468,7 +468,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -665,7 +665,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -686,7 +686,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -707,7 +707,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -757,7 +757,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -796,7 +796,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -825,7 +825,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -872,7 +872,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,7 +891,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -972,7 +972,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1032,7 +1032,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1060,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1079,7 +1079,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru bs1770gain-0.5.1/ar-lib bs1770gain-0.5.2/ar-lib --- bs1770gain-0.5.1/ar-lib 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/ar-lib 2019-01-23 08:44:44.000000000 +0000 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2017 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN*|MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin|msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) diff -Nru bs1770gain-0.5.1/bs1770gain/bs1770gain_tree.c bs1770gain-0.5.2/bs1770gain/bs1770gain_tree.c --- bs1770gain-0.5.1/bs1770gain/bs1770gain_tree.c 2018-08-11 03:40:08.000000000 +0000 +++ bs1770gain-0.5.2/bs1770gain/bs1770gain_tree.c 2019-01-23 03:10:29.000000000 +0000 @@ -84,6 +84,7 @@ #endif // ] analyze_config_t ac; +//DMARKLN(); TRACE_PUSH(); album=bs1770gain_album_new(NULL==parent?NULL:parent->path,odirname,options); @@ -151,9 +152,9 @@ ac.lfe=options->lfe; #endif // ] -//DMARKLN(); +DMARKLN(); if (ffsox_analyze(&ac,options->audio,ac.vi=options->video)<0) { -//DMARKLN(); +DMARKLN(); #if defined (W_WIN32) // [ if (options->utf16) pbu_vwritelnw(f,__FILE__,__LINE__,__func__, diff -Nru bs1770gain-0.5.1/bs1770gain/Makefile.am bs1770gain-0.5.2/bs1770gain/Makefile.am --- bs1770gain-0.5.1/bs1770gain/Makefile.am 2018-10-18 15:55:40.000000000 +0000 +++ bs1770gain-0.5.2/bs1770gain/Makefile.am 2018-10-26 04:09:07.000000000 +0000 @@ -40,22 +40,23 @@ bs1770gain_LDADD+=$(top_builddir)/libffsox-2/libffsox_2.a bs1770gain_LDADD+=$(top_builddir)/lib1770-2/lib1770_2.a bs1770gain_LDADD+=$(top_builddir)/libpbutil/libpbutil.a -if WIN32 -AM_LDFLAGS+=-lsox.dll -AM_LDFLAGS+=-lavformat.dll -AM_LDFLAGS+=-lavcodec.dll -AM_LDFLAGS+=-lswresample.dll -AM_LDFLAGS+=-lavutil.dll -else -AM_LDFLAGS+=-lsox -AM_LDFLAGS+=-lavformat -AM_LDFLAGS+=-lavcodec -AM_LDFLAGS+=-lswresample -AM_LDFLAGS+=-lavutil -if FFSOX_DYNLOAD -bs1770gain_LDADD+=-ldl -endif -endif +#if WIN32 +#AM_LDFLAGS+=-lsox.dll +#AM_LDFLAGS+=-lavformat.dll +#AM_LDFLAGS+=-lavcodec.dll +#AM_LDFLAGS+=-lswresample.dll +#AM_LDFLAGS+=-lavutil.dll +#else +#if FFSOX_DYNLOAD +#bs1770gain_LDADD+=-ldl +#else +#AM_LDFLAGS+=-lsox +#AM_LDFLAGS+=-lavformat +#AM_LDFLAGS+=-lavcodec +#AM_LDFLAGS+=-lswresample +#AM_LDFLAGS+=-lavutil +#endif +#endif bs1770gain_LDADD+=-lm noinst_LIBRARIES=libbs1770gain.a diff -Nru bs1770gain-0.5.1/bs1770gain/Makefile.in bs1770gain-0.5.2/bs1770gain/Makefile.in --- bs1770gain-0.5.1/bs1770gain/Makefile.in 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/bs1770gain/Makefile.in 2019-01-23 08:44:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -94,11 +94,6 @@ #AM_LDFLAGS+=-static-libstdc++ @WIN32_TRUE@am__append_1 = -municode bin_PROGRAMS = bs1770gain$(EXEEXT) -@WIN32_TRUE@am__append_2 = -lsox.dll -lavformat.dll -lavcodec.dll \ -@WIN32_TRUE@ -lswresample.dll -lavutil.dll -@WIN32_FALSE@am__append_3 = -lsox -lavformat -lavcodec -lswresample \ -@WIN32_FALSE@ -lavutil -@FFSOX_DYNLOAD_TRUE@@WIN32_FALSE@am__append_4 = -ldl subdir = bs1770gain ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -127,12 +122,11 @@ PROGRAMS = $(bin_PROGRAMS) am_bs1770gain_OBJECTS = bs1770gain.$(OBJEXT) bs1770gain_OBJECTS = $(am_bs1770gain_OBJECTS) -am__DEPENDENCIES_1 = bs1770gain_DEPENDENCIES = libbs1770gain.a \ $(top_builddir)/libffsox-2/libffsox_2.a \ $(top_builddir)/libffsox-2/libffsox_2.a \ $(top_builddir)/lib1770-2/lib1770_2.a \ - $(top_builddir)/libpbutil/libpbutil.a $(am__DEPENDENCIES_1) + $(top_builddir)/libpbutil/libpbutil.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -285,7 +279,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -302,14 +295,30 @@ #AM_CFLAGS+=-Wno-unused-variable AM_CPPFLAGS = -I$(top_srcdir)/libpbutil -I$(top_srcdir)/lib1770-2 \ -I$(top_srcdir)/libffsox-2 -AM_LDFLAGS = $(am__append_1) @BS1770GAIN_LDFLAGS@ $(am__append_2) \ - $(am__append_3) +AM_LDFLAGS = $(am__append_1) @BS1770GAIN_LDFLAGS@ bs1770gain_SOURCES = bs1770gain.c +#if WIN32 +#AM_LDFLAGS+=-lsox.dll +#AM_LDFLAGS+=-lavformat.dll +#AM_LDFLAGS+=-lavcodec.dll +#AM_LDFLAGS+=-lswresample.dll +#AM_LDFLAGS+=-lavutil.dll +#else +#if FFSOX_DYNLOAD +#bs1770gain_LDADD+=-ldl +#else +#AM_LDFLAGS+=-lsox +#AM_LDFLAGS+=-lavformat +#AM_LDFLAGS+=-lavcodec +#AM_LDFLAGS+=-lswresample +#AM_LDFLAGS+=-lavutil +#endif +#endif bs1770gain_LDADD = libbs1770gain.a \ $(top_builddir)/libffsox-2/libffsox_2.a \ $(top_builddir)/libffsox-2/libffsox_2.a \ $(top_builddir)/lib1770-2/lib1770_2.a \ - $(top_builddir)/libpbutil/libpbutil.a $(am__append_4) -lm + $(top_builddir)/libpbutil/libpbutil.a -lm noinst_LIBRARIES = libbs1770gain.a libbs1770gain_a_SOURCES = bs1770gain.h bs1770gain_priv.h \ bs1770gain_print_xml.c bs1770gain_print_classic.c \ diff -Nru bs1770gain-0.5.1/compile bs1770gain-0.5.2/compile --- bs1770gain-0.5.1/compile 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/compile 2019-01-23 08:44:44.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN*|MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/*|msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru bs1770gain-0.5.1/configure bs1770gain-0.5.2/configure --- bs1770gain-0.5.1/configure 2018-10-19 08:26:19.000000000 +0000 +++ bs1770gain-0.5.2/configure 2019-01-23 08:44:38.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for bs1770gain 0.5.1. +# Generated by GNU Autoconf 2.69 for bs1770gain 0.5.2. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='bs1770gain' PACKAGE_TARNAME='bs1770gain' -PACKAGE_VERSION='0.5.1' -PACKAGE_STRING='bs1770gain 0.5.1' +PACKAGE_VERSION='0.5.2' +PACKAGE_STRING='bs1770gain 0.5.2' PACKAGE_BUGREPORT='pbelkner@users.sf.net' PACKAGE_URL='http://bs1770gain.sourceforge.net/' @@ -712,7 +712,6 @@ docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -789,7 +788,6 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1042,15 +1040,6 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1188,7 +1177,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1301,7 +1290,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bs1770gain 0.5.1 to adapt to many kinds of systems. +\`configure' configures bs1770gain 0.5.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1341,7 +1330,6 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1368,7 +1356,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bs1770gain 0.5.1:";; + short | recursive ) echo "Configuration of bs1770gain 0.5.2:";; esac cat <<\_ACEOF @@ -1468,7 +1456,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bs1770gain configure 0.5.1 +bs1770gain configure 0.5.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1724,7 +1712,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bs1770gain $as_me 0.5.1, which was +It was created by bs1770gain $as_me 0.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2587,7 +2575,7 @@ # Define the identity of the package. PACKAGE='bs1770gain' - VERSION='0.5.1' + VERSION='0.5.2' cat >>confdefs.h <<_ACEOF @@ -4742,6 +4730,8 @@ $as_echo "$win32" >&6; } # } +LIBS_INITIAL=${LIBS} + # test for FFmpeg [ unset withval @@ -5490,8 +5480,7 @@ fi -fi # ] -if test "x$sox" == "xno" ; then # [ +else # ] [ as_fn_error $? "SoX not found" "$LINENO" 5 fi # ] # test for SoX ] @@ -5618,6 +5607,8 @@ fi if test "x$dynload" = "xyes"; then # [ + # revert LIBS to it's initial state + LIBS=${LIBS_INITIAL} $as_echo "#define HAVE_FFSOX_DYNLOAD 1" >>confdefs.h @@ -6276,7 +6267,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bs1770gain $as_me 0.5.1, which was +This file was extended by bs1770gain $as_me 0.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6343,7 +6334,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bs1770gain config.status 0.5.1 +bs1770gain config.status 0.5.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru bs1770gain-0.5.1/configure.ac bs1770gain-0.5.2/configure.ac --- bs1770gain-0.5.1/configure.ac 2018-10-19 08:26:15.000000000 +0000 +++ bs1770gain-0.5.2/configure.ac 2019-01-23 08:44:30.000000000 +0000 @@ -26,7 +26,7 @@ # AC_CHECK_HEADER (header-file, [action-if-found], [action-if-not-found], [includes = `default-includes']) # AC_CHECK_LIB (library, function, [action-if-found], [action-if-not-found], [other-libraries]) -AC_INIT([bs1770gain], [0.5.1], [pbelkner@users.sf.net], [], [http://bs1770gain.sourceforge.net/]) +AC_INIT([bs1770gain], [0.5.2], [pbelkner@users.sf.net], [], [http://bs1770gain.sourceforge.net/]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_PROG_AR() AC_PROG_CC @@ -55,6 +55,8 @@ AC_MSG_RESULT($win32) # } +LIBS_INITIAL=${LIBS} + # test for FFmpeg [ unset withval AC_ARG_WITH(ffmpeg, AS_HELP_STRING([--with-ffmpeg=[DIR]], [path to FFmpeg installation]), @@ -118,8 +120,7 @@ AC_CHECK_HEADER(sox.h, AC_CHECK_LIB(sox, sox_version, [sox=yes LIBS="${LIBS} -lsox"], sox=no), sox=no) -fi # ] -if test "x$sox" == "xno" ; then # [ +else # ] [ AC_MSG_ERROR([SoX not found]) fi # ] # test for SoX ] @@ -214,6 +215,8 @@ dynload=yes, dynload=no) AM_CONDITIONAL([FFSOX_DYNLOAD], [test x$dynload = xyes]) if test "x$dynload" = "xyes"; then # [ + # revert LIBS to it's initial state + LIBS=${LIBS_INITIAL} AC_DEFINE([HAVE_FFSOX_DYNLOAD], [1], [Define to 1 if SoX and FFmpeg should be loaded dynamically.]) # test for dl [ diff -Nru bs1770gain-0.5.1/debian/changelog bs1770gain-0.5.2/debian/changelog --- bs1770gain-0.5.1/debian/changelog 2019-01-17 20:51:33.000000000 +0000 +++ bs1770gain-0.5.2/debian/changelog 2019-01-23 11:32:26.000000000 +0000 @@ -1,7 +1,21 @@ +bs1770gain (0.5.2-2) unstable; urgency=medium + + * Need to add ffmpeg to build dependencies too. + + -- Petter Reinholdtsen Wed, 23 Jan 2019 12:32:26 +0100 + +bs1770gain (0.5.2-1) unstable; urgency=medium + + * Corrected/added bug numbers closed. + * Extended test to verify mp3 files can be measured. + * New upstream version 0.5.2 (Closes: #910451, #920231). + + -- Petter Reinholdtsen Wed, 23 Jan 2019 10:48:53 +0100 + bs1770gain (0.5.1-3) unstable; urgency=medium * Support DEB_BUILD_OPTIONS=nocheck (Closes: #914747) - * Added 2000-non-controversial-usage.patch. (Closes: #914747) + * Added 2000-non-controversial-usage.patch (Closes: #789895). * Updated Standards-Version from 4.2.1 to 4.3.0. -- Petter Reinholdtsen Thu, 17 Jan 2019 21:51:33 +0100 @@ -21,7 +35,7 @@ bs1770gain (0.5.1-1) unstable; urgency=medium - * New upstream version 0.5.1 + * New upstream version 0.5.1 (Closes: #883198, #910451). * Add d/patches/README with number structure for patches. * Adjusted build to get dh-autoreconf working. (Closes: #882224) * Removed obsolete 1000-fix-typo-in-help-entry.patch and diff -Nru bs1770gain-0.5.1/debian/control bs1770gain-0.5.2/debian/control --- bs1770gain-0.5.1/debian/control 2019-01-17 20:50:16.000000000 +0000 +++ bs1770gain-0.5.2/debian/control 2019-01-23 11:20:11.000000000 +0000 @@ -4,6 +4,7 @@ Maintainer: Debian Multimedia Maintainers Uploaders: Petter Reinholdtsen Build-depends: debhelper (>> 10~) + , ffmpeg , libsox-dev , libavformat-dev (>= 7:2.7.0) , sox diff -Nru bs1770gain-0.5.1/debian/tests/control bs1770gain-0.5.2/debian/tests/control --- bs1770gain-0.5.1/debian/tests/control 2018-10-19 09:43:12.000000000 +0000 +++ bs1770gain-0.5.2/debian/tests/control 2019-01-23 09:40:36.000000000 +0000 @@ -1,3 +1,3 @@ Tests: test-cmd-tool -Depends: @, sox +Depends: @, sox, ffmpeg Restrictions: allow-stderr diff -Nru bs1770gain-0.5.1/debian/tests/test-cmd-tool bs1770gain-0.5.2/debian/tests/test-cmd-tool --- bs1770gain-0.5.1/debian/tests/test-cmd-tool 2018-10-19 09:43:12.000000000 +0000 +++ bs1770gain-0.5.2/debian/tests/test-cmd-tool 2019-01-23 09:45:24.000000000 +0000 @@ -49,3 +49,7 @@ sox -b $bits -n $file synth 3 sine 300-3300 test_on_file $file done + +# Test if MP3 work to verify https://bugs.debian.org/910451 is fixed +ffmpeg -i debian/tests/yell.wav $WORKDIR/yell.mp3 +test_on_file $WORKDIR/yell.mp3 diff -Nru bs1770gain-0.5.1/depcomp bs1770gain-0.5.2/depcomp --- bs1770gain-0.5.1/depcomp 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/depcomp 2019-01-23 08:44:44.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # 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 @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru bs1770gain-0.5.1/install-sh bs1770gain-0.5.2/install-sh --- bs1770gain-0.5.1/install-sh 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/install-sh 2019-01-23 08:44:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2014-09-12.12; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -324,41 +324,34 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # $RANDOM is not portable (e.g. dash); use it when possible to - # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - # As "mkdir -p" follows symlinks and we work in /tmp possibly; so - # create the $tmpdir first (and fail if unsuccessful) to make sure - # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + rmdir "$tmpdir/d" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null fi trap '' 0;; esac;; @@ -503,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru bs1770gain-0.5.1/lib1770-2/Makefile.in bs1770gain-0.5.2/lib1770-2/Makefile.in --- bs1770gain-0.5.1/lib1770-2/Makefile.in 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/lib1770-2/Makefile.in 2019-01-23 08:44:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -260,7 +260,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_analyze.c bs1770gain-0.5.2/libffsox-2/ffsox_analyze.c --- bs1770gain-0.5.1/libffsox-2/ffsox_analyze.c 2018-08-02 15:16:48.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_analyze.c 2019-01-23 04:16:19.000000000 +0000 @@ -47,6 +47,7 @@ #endif // } char buf[32]; +//DMARKLN(); #if defined (W_WIN32) // [ if (ac->utf16) { fflush(ac->f); @@ -55,20 +56,24 @@ #endif // ] // create a source. +//DMARKLN(); if (ffsox_source_create(&si,ac->path,ai,vi,progress,ac->f)<0) { DMESSAGE("creating source"); goto si; } +//DMARKLN(); if (0!=ac->dump&&NULL!=ac->f) av_dump_format(si.f.fc,0,si.f.path,0); +//DMARKLN(); // create a frame reader. if (NULL==(fr=ffsox_frame_reader_new(&si,si.ai,ac->stereo,ac->drc))) { DMESSAGE("creating frame reader"); goto fr; } +//DMARKLN(); // create a BS.1770 collector. memset(&cc,0,sizeof cc); cc.aggregate=ac->aggregate; @@ -81,46 +86,56 @@ cc.lfe=ac->lfe; #endif // ] +//DMARKLN(); if (ffsox_collect_create(&collect,&cc)<0) { DMESSAGE("creating collector"); goto collect; } +//DMARKLN(); // create a SoX reader. intercept.data=&collect; intercept.channel=ffsox_collect_channel; intercept.sample=ffsox_collect_sample; +//DMARKLN(); if (NULL==(read=ffsox_sox_reader_new(fr,collect.scale,&intercept))) { DMESSAGE("creating SoX reader"); goto sa; } +//DMARKLN(); signal=read->signal; +//DMARKLN(); // create the SoX chain. if (NULL==(chain=sox_create_effects_chain(&read->encoding,NULL))) { DMESSAGE("creating SoX chain"); goto chain; } +//DMARKLN(); // add the SoX read effect to the SoX chain. n=0; opts[n++]=(char *)read; +//DMARKLN(); if (SOX_SUCCESS!=ffsox_sox_add_effect_fn(chain,&signal,&signal, n,opts,ffsox_sox_read_handler)) { DMESSAGE("creating SoX read effect"); goto effect; } +//DMARKLN(); // add the SoX rate effect to the SoX chain. if (0!=(AGGREGATE_TRUEPEAK&aggregate->flags)) { #if defined (FFSOX_ANALYZE_CASCADE) // { //#error FFSOX_ANALYZE_CASCADE rate=signal.rate; +//DMARKLN(); while ((rate*=2.0)<=FFSOX_ANALYZE_RATE) { +//DMARKLN(); //rate*=2; n=0; sprintf(buf,"%.0f",rate); @@ -133,10 +148,12 @@ } } #else // } { +//DMARKLN(); n=0; sprintf(buf,"%.0f",FFSOX_ANALYZE_RATE); opts[n++]=buf; +//DMARKLN(); if (SOX_SUCCESS!=ffsox_sox_add_effect_name(chain,&signal,&signal, n,opts,"rate")) { DMESSAGE("creating SoX rate effect"); @@ -145,14 +162,17 @@ #endif // } } +//DMARKLN(); // add the SoX pull effect to the SoX chain. n=0; +//DMARKLN(); if (0!=(AGGREGATE_TRUEPEAK&aggregate->flags)) { opts[n++]=(char *)ffsox_collect_truepeak; opts[n++]=(char *)&collect; } +//DMARKLN(); if (SOX_SUCCESS!=ffsox_sox_add_effect_fn(chain,&signal,&signal, n,opts,ffsox_sox_pull_handler)) { DMESSAGE("creating SoX pull effect"); @@ -174,14 +194,18 @@ // cleanup: flow: effect: +//DMARKLN(); sox_delete_effects_chain(chain); chain: sa: +//DMARKLN(); ffsox_collect_cleanup(&collect); collect: fr: +//DMARKLN(); si.vmt->cleanup(&si); si: +//DMARKLN(); #if defined (W_WIN32) // [ if (ac->utf16) { fflush(ac->f); @@ -191,5 +215,6 @@ mode: #endif // ] #endif // ] +//DMARKLN(); return code; } diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_dynload2.c bs1770gain-0.5.2/libffsox-2/ffsox_dynload2.c --- bs1770gain-0.5.1/libffsox-2/ffsox_dynload2.c 2018-10-16 06:45:06.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_dynload2.c 2019-01-23 03:05:42.000000000 +0000 @@ -956,23 +956,23 @@ #if defined (_WIN32) // [ wcscpy(pp,AVUTIL); avutil.hLib=LoadLibraryW(path); - DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); + //DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); #else // ] [ strcpy(pp,AVUTIL); avutil.hLib=dlopen(path,DLOPEN_FLAG); - DVWRITELN("%p \"%s\"",avutil.hLib,path); + //DVWRITELN("%p \"%s\"",avutil.hLib,path); #endif // ] #if defined (_WIN32) // [ if (!avutil.hLib&&!(avutil.hLib=LoadLibraryW(AVUTIL))) { PBU_DMESSAGE("loading avutil"); - DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); + //DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); return -1; } #else // ] [ if (!avutil.hLib&&!(avutil.hLib=dlopen(AVUTIL,DLOPEN_FLAG))) { PBU_DMESSAGE("loading avutil"); - DVWRITELN(L"%p \"%s\"",avutil.hLib,path); + //DVWRITELN("%p \"%s\"",avutil.hLib,path); return -1; } #endif // ] @@ -1003,23 +1003,23 @@ #if defined (_WIN32) // [ wcscpy(pp,SWRESAMPLE); swresample.hLib=LoadLibraryW(path); - DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); + //DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); #else // ] [ strcpy(pp,SWRESAMPLE); swresample.hLib=dlopen(path,DLOPEN_FLAG); - DVWRITELN("%p \"%s\"",avutil.hLib,path); + //DVWRITELN("%p \"%s\"",avutil.hLib,path); #endif // ] #if defined (_WIN32) // [ if (!swresample.hLib&&!(swresample.hLib=LoadLibraryW(SWRESAMPLE))) { PBU_DMESSAGE("loading swresample"); - DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); + //DVWRITELNW(L"%p \"%s\"",avutil.hLib,path); return -1; } #else // ] [ if (!swresample.hLib&&!(swresample.hLib=dlopen(SWRESAMPLE,DLOPEN_FLAG))) { PBU_DMESSAGE("loading swresample"); - DVWRITELN("%p \"%s\"",avutil.hLib,path); + //DVWRITELN("%p \"%s\"",avutil.hLib,path); return -1; } #endif // ] @@ -1151,6 +1151,7 @@ return -1; } +//DMARKLN(); #if defined (_WIN32) // [ wcscpy(pp,LIBSOX); libsox.hLib=LoadLibraryW(path); @@ -1158,6 +1159,7 @@ strcpy(pp,LIBSOX); libsox.hLib=dlopen(path,DLOPEN_FLAG); #endif // ] +//DMARKLN(); #if defined (_WIN32) // [ if (!libsox.hLib&&!(libsox.hLib=LoadLibraryW(LIBSOX))) { @@ -1169,6 +1171,7 @@ return -1; } #else // ] [ +//DMARKLN(); if (!libsox.hLib&&!(libsox.hLib=dlopen(LIBSOX,DLOPEN_FLAG))) { PBU_DMESSAGE("loading libsox"); #if defined (PBU_DEBUG) // [ @@ -1178,6 +1181,7 @@ return -1; } #endif // ] +//DMARKLN(); } return load(libsox.hLib,sym,p); diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_dynload.h bs1770gain-0.5.2/libffsox-2/ffsox_dynload.h --- bs1770gain-0.5.1/libffsox-2/ffsox_dynload.h 2018-10-16 06:44:09.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_dynload.h 2018-10-26 01:17:03.000000000 +0000 @@ -126,9 +126,7 @@ typeof (av_frame_set_channel_layout) *av_frame_set_channel_layout; typeof (av_frame_get_channel_layout) *av_frame_get_channel_layout; typeof (av_frame_set_channels) *av_frame_set_channels; -#if defined (FFSOX_AV_FRAME_GET_CHANNELS) // [ typeof (av_frame_get_channels) *av_frame_get_channels; -#endif // ] typeof (av_frame_set_sample_rate) *av_frame_set_sample_rate; typeof (av_frame_get_sample_rate) *av_frame_get_sample_rate; typeof (av_samples_alloc) *av_samples_alloc; @@ -160,9 +158,7 @@ void (*av_frame_set_channel_layout)(AVFrame *frame, int64_t val); int64_t (*av_frame_get_channel_layout)(const AVFrame *frame); void (*av_frame_set_channels)(AVFrame *frame, int val); -#if defined (FFSOX_AV_FRAME_GET_CHANNELS) // [ int (*av_frame_get_channels)(const AVFrame *frame); -#endif // ] void (*av_frame_set_sample_rate)(AVFrame *frame, int val); int (*av_frame_get_sample_rate)(const AVFrame *frame); int (*av_samples_alloc)(uint8_t **audio_data, int *linesize, @@ -372,9 +368,7 @@ #define av_frame_get_channel_layout \ (*ffsox_avutil.av_frame_get_channel_layout) #define av_frame_set_channels (*ffsox_avutil.av_frame_set_channels) -#if defined (FFSOX_AV_FRAME_GET_CHANNELS) // [ #define av_frame_get_channels (*ffsox_avutil.av_frame_get_channels) -#endif // ] #define av_frame_set_sample_rate (*ffsox_avutil.av_frame_set_sample_rate) #define av_frame_get_sample_rate (*ffsox_avutil.av_frame_get_sample_rate) #define av_samples_alloc (*ffsox_avutil.av_samples_alloc) diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_frame_reader.c bs1770gain-0.5.2/libffsox-2/ffsox_frame_reader.c --- bs1770gain-0.5.1/libffsox-2/ffsox_frame_reader.c 2018-08-02 15:15:35.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_frame_reader.c 2019-01-23 07:38:32.000000000 +0000 @@ -265,6 +265,7 @@ return MACHINE_POP; case STATE_FLUSH: +#if 0 // [ pkt->size=0; pkt->data=NULL; @@ -274,6 +275,7 @@ return frame_reader_next_set_frame(n,NULL); } +#if 0 // [ else if (avcodec_decode_audio4(cc,frame,&got_frame,pkt)<0) { DMESSAGE("decoding audio"); #if defined (FRAME_READER_RUN_CODE) // [ @@ -282,6 +284,26 @@ return -1; #endif // ] } +#else // ] [ + else { + if (!pkt->data||!pkt->size) { + n->state=STATE_END; + + return frame_reader_next_set_frame(n,NULL); + } + + code=avcodec_decode_audio4(cc,frame,&got_frame,pkt); + + if (code<0) { + DMESSAGE("decoding audio"); +#if defined (FRAME_READER_RUN_CODE) // [ + goto exit; +#else // ] [ + return -1; +#endif // ] + } + } +#endif // ] //DMARKLN(); if (0==got_frame) { @@ -297,6 +319,11 @@ return frame_reader_next_set_frame(n,fo); #endif // ] } +#else // ] [ + n->state=STATE_END; + + return frame_reader_next_set_frame(n,NULL); +#endif // ] case STATE_END: //DMARKLN(); #if defined (FRAME_READER_RUN_CODE) // [ diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_sink.c bs1770gain-0.5.2/libffsox-2/ffsox_sink.c --- bs1770gain-0.5.1/libffsox-2/ffsox_sink.c 2018-07-24 03:31:46.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_sink.c 2018-12-26 14:38:54.000000000 +0000 @@ -59,7 +59,8 @@ { #if ! defined (FFSOX_NO_AVFMT_NOFILE) // [ if (0==(s->f.fc->oformat->flags&AVFMT_NOFILE)) { - if (avio_open(&s->f.fc->pb,s->f.path,AVIO_FLAG_WRITE)<0) { +DWRITELN(s->f.path); + if (avio_open(&s->f.fc->pb,s->f.path,AVIO_FLAG_READ_WRITE)<0) { DMESSAGE("opening output file"); goto open; } diff -Nru bs1770gain-0.5.1/libffsox-2/ffsox_sox_pull_handler.c bs1770gain-0.5.2/libffsox-2/ffsox_sox_pull_handler.c --- bs1770gain-0.5.1/libffsox-2/ffsox_sox_pull_handler.c 2018-07-24 03:31:47.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/ffsox_sox_pull_handler.c 2019-01-23 04:18:06.000000000 +0000 @@ -32,8 +32,10 @@ { priv_t *priv=e->priv; +//DMARKLN(); priv->cb=1data=2data; rp=ibuf; mp=rp+*isamp; scale=1.0/MAXOF(*rp); +//DMARKLN(); while (rppriv; +//DMARKLN(); if (argc<2) { DMESSAGE("missing argument"); goto argc; } +//DMARKLN(); priv->read=(void *)argv[1]; +//DMARKLN(); return SOX_SUCCESS; argc: @@ -48,13 +51,16 @@ priv_t *priv=e->priv; sox_reader_t *read=priv->read; +//DMARKLN(); /* ensure that *osamp is a multiple of the number of channels. */ *osamp-=*osamp%e->out_signal.channels; +//DMARKLN(); /* Read up to *osamp samples into obuf; store the actual number read * back to *osamp */ *osamp=ffsox_sox_reader_read(read,obuf,*osamp); +//DMARKLN(); #if defined (PBU_DEBUG) // { /* sox_read may return a number that is less than was requested; only if * 0 samples is returned does it indicate that end-of-file has been reached @@ -63,6 +69,7 @@ DMESSAGE("reading"); #endif // } +//DMARKLN(); return 0==*osamp?SOX_EOF:SOX_SUCCESS; } diff -Nru bs1770gain-0.5.1/libffsox-2/Makefile.in bs1770gain-0.5.2/libffsox-2/Makefile.in --- bs1770gain-0.5.1/libffsox-2/Makefile.in 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/libffsox-2/Makefile.in 2019-01-23 08:44:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -276,7 +276,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru bs1770gain-0.5.1/libpbutil/Makefile.in bs1770gain-0.5.2/libpbutil/Makefile.in --- bs1770gain-0.5.1/libpbutil/Makefile.in 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/libpbutil/Makefile.in 2019-01-23 08:44:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -264,7 +264,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru bs1770gain-0.5.1/libpbutil/pbu_mkdir.c bs1770gain-0.5.2/libpbutil/pbu_mkdir.c --- bs1770gain-0.5.1/libpbutil/pbu_mkdir.c 2015-06-23 07:38:45.000000000 +0000 +++ bs1770gain-0.5.2/libpbutil/pbu_mkdir.c 2018-10-27 05:17:29.000000000 +0000 @@ -67,7 +67,14 @@ p2=p1; // TODO: unicode. + // For the following fix thanks to . +#if 0 // [ while (0!=*p2&&'/'!=*p2&&'\\'!=*p2) +#elif defined (_WIN32) // ] [ + while (0!=*p2&&'\\'!=*p2) +#else // ] [ + while (0!=*p2&&'/'!=*p2) +#endif // ] ++p2; if (0==*p2) { diff -Nru bs1770gain-0.5.1/Makefile.in bs1770gain-0.5.2/Makefile.in --- bs1770gain-0.5.1/Makefile.in 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/Makefile.in 2019-01-23 08:44:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -296,7 +296,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -530,7 +529,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -556,7 +555,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -574,7 +573,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -584,7 +583,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru bs1770gain-0.5.1/missing bs1770gain-0.5.2/missing --- bs1770gain-0.5.1/missing 2018-10-19 08:26:20.000000000 +0000 +++ bs1770gain-0.5.2/missing 2019-01-23 08:44:44.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: