[SCM] bs1770gain/master: Imported Upstream version 0.4.6

pere at users.alioth.debian.org pere at users.alioth.debian.org
Sun Sep 13 21:44:35 UTC 2015


The following commit has been merged in the master branch:
commit 8c393e684e396f158741eded2a04cdf40e458a53
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 13 16:07:10 2015 +0200

    Imported Upstream version 0.4.6

diff --git a/bs1770gain/bs1770gain.c b/bs1770gain/bs1770gain.c
index afc4272..83bc83a 100755
--- a/bs1770gain/bs1770gain.c
+++ b/bs1770gain/bs1770gain.c
@@ -47,10 +47,10 @@
 void bs1770gain_usage(char **argv, int code)
 {
 #if defined (PACKAGE_VERSION) // {
-  fprintf(stderr,"BS1770GAIN %s, Copyright (C) Peter Belkner 2014, 2015.\n",
+  fprintf(stderr,"BS1770GAIN %s, Copyright (C) Peter Belkner 2014-2015.\n",
       PACKAGE_VERSION);
 #else // } {
-  fprintf(stderr,"BS1770GAIN, Copyright (C) Peter Belkner 2014, 2015.\n");
+  fprintf(stderr,"BS1770GAIN, Copyright (C) Peter Belkner 2014-2015.\n");
 #endif // }
 #if defined (PACKAGE_URL) // {
   fprintf(stderr,"%s\n",PACKAGE_URL);
@@ -124,7 +124,7 @@ void bs1770gain_usage(char **argv, int code)
   fprintf(stderr," --video <index>:  select video index (corresponds to\n"
       "   [0:<index>] in FFmpeg listing, cf. -l/--list option)\n");
   fprintf(stderr," --stereo:  convert to stereo\n");
-  fprintf(stderr," --drc <drc>:  set AC3 dynamic range compression (DRC)\n");
+  fprintf(stderr," --drc <float>:  set AC3 dynamic range compression (DRC)\n");
   fprintf(stderr," --extension <extension>:  enable extension out of\n"
       "   \"rename\":  rename files according to TITLE tag\n"
       "   \"csv\":  read metadata from per-folder CSV file \"folder.csv\"\n"
diff --git a/bs1770gain/bs1770gain_print_xml.c b/bs1770gain/bs1770gain_print_xml.c
index 8f9fba1..fa4c671 100755
--- a/bs1770gain/bs1770gain_print_xml.c
+++ b/bs1770gain/bs1770gain_print_xml.c
@@ -35,6 +35,7 @@ void bs1770gain_print_xml(bs1770gain_print_t *p, FILE *f)
 static void session_head(bs1770gain_print_t *p)
 {
   fprintf(p->f,"<bs1770gain>\n");
+  fflush(p->f);
 }
 
 static FILE *session_file(bs1770gain_print_t *p)
@@ -45,6 +46,7 @@ static FILE *session_file(bs1770gain_print_t *p)
 static void session_tail(bs1770gain_print_t *p)
 {
   fprintf(p->f,"</bs1770gain>\n");
+  fflush(p->f);
 }
 
 ////////
@@ -57,12 +59,15 @@ static void album_head(bs1770gain_print_t *p, bs1770gain_album_t *a,
     fprintf(p->f,"  <album>\n");
   else
     fprintf(p->f,"  <album folder=\"%s\">\n",ibasename);
+
+  fflush(p->f);
 }
 
 static void album_tail(bs1770gain_print_t *p)
 {
   p->a=NULL;
   fprintf(p->f,"  </album>\n");
+  fflush(p->f);
 }
 
 ////////
@@ -76,6 +81,8 @@ static void track_head(bs1770gain_print_t *p, bs1770gain_track_t *t)
     fprintf(p->f,"    <track total=\"%d\" number=\"%d\" file=\"%s\">\n",
         p->a->n,t->n,pbu_basename(t->ipath));
   }
+
+  fflush(p->f);
 }
 
 static void track_body(bs1770gain_print_t *p, aggregate_t *aggregate,
@@ -138,13 +145,16 @@ static void track_body(bs1770gain_print_t *p, aggregate_t *aggregate,
   if (0!=(flags&AGGREGATE_TRUEPEAK)) {
     q=aggregate->truepeak;
     db=LIB1770_Q2DB(q);
-    fprintf(f,"      <true-peak tpfs=\"%.1f\" factor=\" %f\" />\n",db,q);
+    fprintf(f,"      <true-peak tpfs=\"%.1f\" factor=\"%f\" />\n",db,q);
   }
+
+  fflush(p->f);
 }
 
 static void track_tail(bs1770gain_print_t *p)
 {
   fprintf(p->f,p->t?"    </track>\n":"    </summary>\n");
+  fflush(p->f);
   p->t=NULL;
 }
 
diff --git a/configure b/configure
index 5c31da0..b038855 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.6-beta2.
+# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.6.
 #
 # Report bugs to <pbelkner at users.sf.net>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bs1770gain'
 PACKAGE_TARNAME='bs1770gain'
-PACKAGE_VERSION='0.4.6-beta2'
-PACKAGE_STRING='bs1770gain 0.4.6-beta2'
+PACKAGE_VERSION='0.4.6'
+PACKAGE_STRING='bs1770gain 0.4.6'
 PACKAGE_BUGREPORT='pbelkner at users.sf.net'
 PACKAGE_URL='http://bs1770gain.sourceforge.net/'
 
@@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
   # 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.4.6-beta2 to adapt to many kinds of systems.
+\`configure' configures bs1770gain 0.4.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bs1770gain 0.4.6-beta2:";;
+     short | recursive ) echo "Configuration of bs1770gain 0.4.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1440,7 +1440,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bs1770gain configure 0.4.6-beta2
+bs1770gain configure 0.4.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1696,7 +1696,7 @@ cat >config.log <<_ACEOF
 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.4.6-beta2, which was
+It was created by bs1770gain $as_me 0.4.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2511,7 +2511,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='bs1770gain'
- VERSION='0.4.6-beta2'
+ VERSION='0.4.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5167,7 +5167,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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.4.6-beta2, which was
+This file was extended by bs1770gain $as_me 0.4.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5234,7 +5234,7 @@ _ACEOF
 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.4.6-beta2
+bs1770gain config.status 0.4.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 7201296..8f7b22f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -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.4.6-beta2], [pbelkner at users.sf.net], [], [http://bs1770gain.sourceforge.net/])
+AC_INIT([bs1770gain], [0.4.6], [pbelkner at users.sf.net], [], [http://bs1770gain.sourceforge.net/])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_PROG_RANLIB

-- 
bs1770gain packaging



More information about the pkg-multimedia-commits mailing list