shithub: sox

Info  •  Files  •  Log  •  Branches

Remove deprecated -b and -i options to the norm effect

--- a/ChangeLog

+++ b/ChangeLog

@@ -14,6 +14,7 @@

   -------  ----------------------  ----------------------

   14.3.0   O --interactive         --no-clobber

   14.3.0   E filter                ~=sinc

+  14.3.0   E norm -b, norm -i      gain -B, gain -en

   14.2.0   E key alias             pitch

   14.2.0   E pan                   ~= mixer/remix

   14.1.0   E resample alias        rate

@@ -29,7 +30,6 @@

   14.3.1   F sndfile: sndfile 1.0.11 sndfile > 1.0.11      14.3.1

   14.3.0   F flac: libFLAC 1.1.2,3 libFLAC > 1.1.3         14.3.1

   14.3.0   PLAY_RATE_ARG           SOX_OPTS                (now)

-  14.3.0   E norm -b, norm -i      gain -B, gain -en       (now)

   14.3.0   O -1/-2/-3/-4/-8        -b                      14.4.0

   14.3.0   O -s/-u/-f              -e                      14.4.0

   14.3.0   O -A/-U/-o/-i/-a/-g     -e                      14.4.0

--- a/sox.1

+++ b/sox.1

@@ -2524,13 +2524,6 @@

 is just an alias for \fBgain \-n\fR; see the

 .B gain

 effect for details.

-.SP

-Note that \fBnorm\fR's

-.B \-i

-and

-.B \-b

-options are deprecated (having been superseded by \fBgain \-en\fR and

-\fBgain \-B\fR respectively) and will be removed in a future release.

 .TP

 \fBoops\fR

 Out Of Phase Stereo effect.

--- a/src/gain.c

+++ b/src/gain.c

@@ -251,16 +251,10 @@

 static int norm_getopts(sox_effect_t * effp, int argc, char * * argv)

 {

   char * argv2[3];

-  int argc2 = 0;

+  int argc2 = 2;

-  argv2[argc2++] = argv[0], --argc, ++argv;

-  if (argc && !strcmp(*argv, "-i"))

-    argv2[argc2++] = "-en", --argc, ++argv;

-  else if (argc && !strcmp(*argv, "-b"))

-    argv2[argc2++] = "-B", --argc, ++argv;

-  if (argc2 > 1)

-    lsx_warn("this usage is deprecated; use `gain %s' instead", argv2[1]);

-  else argv2[argc2++] = "-n";

+  argv2[0] = argv[0], --argc, ++argv;

+  argv2[1] = "-n";

   if (argc)

     argv2[argc2++] = *argv, --argc, ++argv;

   return argc? lsx_usage(effp) :