shithub: sox

Download patch

ref: 0616603970338b131a5abe19a0ee825faebf4f85
parent: 40b45188ff81e2b2cd439222004bb2450703fefb
author: robs <robs>
date: Sun Mar 9 17:46:49 EDT 2008

updates for recent changes

--- a/AUTHORS
+++ b/AUTHORS
@@ -15,16 +15,16 @@
 		format support, libao playback, Secret Rabbit Code
 		resampling; many fixes and much cleanup.
 	Rob Sykes		robs@users.sourceforge.net
-                Formats: M3U, PLS, FLAC, AMR, HTK, VOC ADPCM,
-                24bit support for popular formats.
-		Effects: key, tempo, pad, bass, treble, new reverb, new
+                Formats: M3U, PLS, FLAC, AMR, HTK, VOX/IMA/VOC ADPCM support,
+                24bit support for popular formats, MP3 tags & duration support.
+		Effects: key, tempo, pad, bass, treble, delay, new reverb, new
 		flanger, soft-knee companding, speed via resampling, filters
 		makeover inc. gnuplot & octave plotting, splice, remix, norm;
 		new effects chain with buffering and any # channels.
-                Others: soxi, open input files via URL, file merging, play
+                Others: open input files via URL, file multiply/merge, play
                 multiple files with mixed format types, play with replay-gain,
                 building with cmake, much manual improvement and expansion,
-		improved displays with -S & -V including VU and clips,
+		soxi, improved displays with -S & -V including VU and clips,
                 various fixes, enhancements and clean-ups.
 
 Contributors:
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
   o New `delay' effect; delay one or more channels.  (robs)
   o Fix crash on 64-bit arch. with tempo & key effects.  (Sami Liedes)
   o Fix synth max. level setting for some output encodings.  (robs)
+  o `gain' alias for the vol effect.  (robs)
 
 Other new features:
 
@@ -66,6 +67,7 @@
     be used to override the default audio device driver (rec/play)
     and default audio device (all).  (robs)
   o Simpler file info display for `play'.  (robs)
+  o New `multiply' method for the input file combiner.  (robs)
 
 Other bug fixes:
 
--- a/sox.1
+++ b/sox.1
@@ -90,9 +90,9 @@
 .EE
 adds a header to a raw audio file,
 .EX
-	sox slow.aiff fixed.aiff speed 1.027 rabbit -c0
+	sox slow.aiff fixed.aiff speed 1.027 rabbit
 .EE
-adjusts audio speed using the most accurate
+adjusts audio speed using the
 .B rabbit
 algorithm,
 .EX
@@ -329,10 +329,12 @@
 SoX's
 .B stat
 effect can assist in determining the signal level in an audio file; the
+.B gain
+or
 .B vol
 effect can be used to prevent clipping, e.g.
 .EX
-	sox dull.au bright.au vol -6 dB treble +6
+	sox dull.au bright.au gain -6 treble +6
 .EE
 guarantees that the treble boost will not clip.
 .SP
@@ -339,9 +341,9 @@
 If clipping occurs at any point during processing, then
 SoX will display a warning message to that effect.
 .SS Input File Combining 
-SoX's input combiner can combine multiple files using one of four
-different methods: `concatenate', `sequence', `mix', or `merge'.  The
-default method is `sequence' for
+SoX's input combiner can combine multiple files using one of five
+different methods: `concatenate', `sequence', `mix', `merge', or `multiply'.
+The default method is `sequence' for
 .BR play ,
 and `concatenate' for
 .B rec
@@ -371,7 +373,8 @@
 output file.  The number of channels in each input file need not be the
 same, however, SoX will issue a warning if they are not and some
 channels in the output file will not contain audio from every input
-file.  A mixed audio file cannot be un-mixed.
+file.  A mixed audio file cannot be un-mixed (without reference to the
+orignal input files).
 .SP
 If the `merge' combining method is selected (with \fB-M\fR), then two or
 more input files must be given and will be merged together to form the
@@ -384,6 +387,11 @@
 For example, two mono files could be merged to form one stereo file; the
 first and second mono files would become the left and right channels of
 the stereo file.
+.SP
+The `multiply' combining method (selected with \fB-T\fR) works in the
+same way as mix combining except that the audio signals are multiplied
+instead of added together.  This can be useful for applications such as
+F.M. synthesis.
 .SP
 When combining input files, SoX applies any specified effects
 (including, for example, the
--- a/soxeffect.7
+++ b/soxeffect.7
@@ -410,6 +410,12 @@
 .SP
 See [3] for a detailed description of flanging.
 .TP
+\fBgain \fIdB-gain\fR
+Apply an amplification or an attenuation to the audio signal.
+This is just a alias for the
+.B vol
+effect\*mhandy for those who prefer to work in dBs by default.
+.TP
 \fBhighpass\fR\^|\^\fBlowpass\fR [\fB-1\fR|\fB-2\fR] \fIfrequency\fR [\fRwidth\fR[\fBq\fR\^|\^\fBo\fR\^|\^\fBh\fR]]
 Apply a high-pass or low-pass filter with 3dB point \fIfrequency\fR.
 The filter can be either single-pole (with
--- a/src/sox.c
+++ b/src/sox.c
@@ -1015,6 +1015,7 @@
 "--replay-gain track|album|off  default: off (sox, rec), track (play)",
 "-R              use default random numbers (same on each run of SoX)",
 "-S, --show-progress  display progress while processing audio data",
+"-T, --combine multiply  multiply multiple input files (instead of concatenating)",
 "--version       display version number of SoX and exit",
 "-V[LEVEL]       increment or set verbosity level (default 2); levels are:",
 "                  1: failure messages",