shithub: sox

Download patch

ref: c4cd4eac0aac666a84c07c5ffefb22cb2a4ce87c
parent: 4f3090aacb7ffeed49a10eae96ee8fdca53a6775
author: Ulrich Klauer <ulrich@chirlu.de>
date: Mon Dec 26 06:11:37 EST 2011

Minor typographical changes

Re-order file names in makefiles, some typographical corrections
in the man page (including one submitted by Michael Witten
<mfwitten@gmail.com>). No functional changes.

--- a/sox.1
+++ b/sox.1
@@ -131,7 +131,7 @@
 .EE
 records half an hour of stereo audio, and
 .EX
-   play \-q take1.aiff & rec \-M take1.aiff take1-dub.aiff
+   play \-q take1.aiff & rec \-M take1.aiff take1\-dub.aiff
 .EE
 (with POSIX shell and where supported by hardware)
 records a new track in a multi-track recording.  Finally,
@@ -194,7 +194,7 @@
 The term `bit-rate' is a measure of the amount of storage occupied by an
 encoded audio signal over a unit of time.  It can depend on all of the
 above and is typically denoted as a number of kilo-bits per second
-(kbps).  An A-law telephony signal has a bit-rate of 64 kbs. MP3-encoded
+(kbps).  An A-law telephony signal has a bit-rate of 64 kbps. MP3-encoded
 stereo music typically has a bit-rate of 128\-196 kbps. FLAC-encoded
 stereo music typically has a bit-rate of 550\-760 kbps.
 .SP
@@ -342,7 +342,7 @@
 Many file formats that compress audio discard some of the audio signal
 information whilst doing so. Converting to such a format and then converting
 back again will not produce an exact copy of the original audio.  This
-is the case for many formats used in telephony (e.g.  A-law, GSM) where
+is the case for many formats used in telephony (e.g. A-law, GSM) where
 low signal bandwidth is more important than high audio fidelity, and for
 many formats used in portable music players (e.g. MP3, Vorbis) where
 adequate fidelity can be retained even with the large compression ratios
@@ -1882,11 +1882,11 @@
 CD player), or simply play the correctly de-emphasised audio files on the
 PC.  For example:
 .EX
-   sox track1.wav track1-deemph.wav deemph
+   sox track1.wav track1\-deemph.wav deemph
 .EE
 and then burn track1-deemph.wav to CD, or
 .EX
-   play track1-deemph.wav
+   play track1\-deemph.wav
 .EE
 or simply
 .EX
@@ -2343,7 +2343,7 @@
 An odd-tap Hilbert transform filter has a bandpass characteristic,
 attenuating the lowest and highest frequencies.  Its bandwidth can be
 controlled by the number of filter taps, which can be specified with
-\fB-n\fR.  By default, the number of taps is chosen for a cutoff
+\fB\-n\fR.  By default, the number of taps is chosen for a cutoff
 frequency of about 75 Hz.
 .SP
 This effect supports the \fB\-\-plot\fR global option.
@@ -2718,7 +2718,7 @@
 .TE
 .DT
 .SP
-N.B.  Override options can not be used with the `quick' or `low'
+N.B.  Override options cannot be used with the `quick' or `low'
 quality algorithms.
 .SP
 All resamplers use filters that can sometimes create `echo' (a.k.a.
@@ -2841,7 +2841,7 @@
 copies of channels 6, 7, and 8 in the input file, and channel 4 is silent.
 Whereas
 .EX
-   sox input.wav output.wav remix 1-3,7 3
+   sox input.wav output.wav remix 1\-3,7 3
 .EE
 creates a (somewhat bizarre) stereo output file where the left channel
 is a mix-down of input channels 1, 2, 3, and 7, and the right channel is
@@ -2939,7 +2939,7 @@
 chans=\`soxi \-c "$1"\`
 while [ $chans \-ge 1 ]; do
    chans0=\`printf %02i $chans\`   # 2 digits hence up to 99 chans
-   out=\`echo "$1"|sed "s/\\(.*\\)\\.\\(.*\\)/\\1-$chans0.\\2/"\`
+   out=\`echo "$1"|sed "s/\\(.*\\)\\.\\(.*\\)/\\1\-$chans0.\\2/"\`
    sox "$1" "$out" remix $chans
    chans=\`expr $chans \- 1\`
 done
@@ -3770,11 +3770,11 @@
 For example, the following produces a 3 second, 48kHz,
 audio file containing a sine-wave swept from 300 to 3300\ Hz:
 .EX
-   sox \-n output.wav synth 3 sine 300-3300
+   sox \-n output.wav synth 3 sine 300\-3300
 .EE
 and this produces an 8\ kHz version:
 .EX
-   sox \-r 8000 \-n output.wav synth 3 sine 300-3300
+   sox \-r 8000 \-n output.wav synth 3 sine 300\-3300
 .EE
 Multiple channels can be synthesised by specifying the set of
 parameters shown between braces multiple times;
@@ -3781,13 +3781,13 @@
 the following puts the swept tone in the left channel and adds `brown'
 noise in the right:
 .EX
-   sox \-n output.wav synth 3 sine 300-3300 brownnoise
+   sox \-n output.wav synth 3 sine 300\-3300 brownnoise
 .EE
 The following example shows how two synth effects can be cascaded
 to create a more complex waveform:
 .EX
 .ne 2
-   play \-n synth 0.5 sine 200-500 synth 0.5 sine fmod 700-100
+   play \-n synth 0.5 sine 200\-500 synth 0.5 sine fmod 700\-100
 .EE
 Frequencies can also be given in `scientific' note notation, or, by
 prefixing a `%' character, as a number of semitones relative to
@@ -3794,7 +3794,7 @@
 `middle A' (440\ Hz).  For example, the following could be used to
 help tune a guitar's low `E' string:
 .EX
-   play \-n synth 4 pluck %-29
+   play \-n synth 4 pluck %\-29
 .EE
 or with a (Bourne shell) loop, the whole guitar:
 .EX
@@ -4011,7 +4011,7 @@
 \fBvad \fR[\fIoptions\fR]
 Voice Activity Detector.  Attempts to trim silence and quiet
 background sounds from the ends of (fairly high resolution
-i.e. 16-bit, 44-48kHz) recordings of speech.  The algorithm currently
+i.e. 16-bit, 44\-48kHz) recordings of speech.  The algorithm currently
 uses a simple cepstral power measurement to detect voice, so may be
 fooled by other things, especially music.  The effect can trim only
 from the front of the audio, so in order to trim from the back, the
@@ -4090,10 +4090,10 @@
 `Brick-wall' frequency of low-pass filter applied at the input to the
 detector algorithm.
 .IP \fB\-H\ \fInum\fR
-`Brick-wall' quefrency of high-pass lifter used in the detector
+`Brick-wall' frequency of high-pass lifter used in the detector
 algorithm.
 .IP \fB\-L\ \fInum\fR
-`Brick-wall' quefrency of low-pass lifter used in the detector
+`Brick-wall' frequency of low-pass lifter used in the detector
 algorithm.
 .RE
 .TP
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,18 +22,17 @@
 
 # Format with: !xargs echo|tr ' ' '\n'|sort|column|expand|sed 's/^/  /'
 set(effects_srcs
-  bend            divide          hilbert         rate            stretch
-  biquad          downsample      input           remix           swap
-  biquads         earwax          loudness        repeat          synth
-  chorus          echo            mcompand        reverb          tempo
-  compand         echos           mixer           reverse         tremolo
-  compandt        fade            noiseprof       silence         trim
-  contrast        fft4g           noisered        sinc            upsample
-  crop                            output          skeleff         vad
-  dcshift         fir             overdrive       speed           vol
-  delay           firfit          pad             splice
-  dft_filter      flanger                         stat
-  dither          gain            phaser          stats
+  bend            dither          gain            phaser          stat
+  biquad          divide          hilbert         rate            stats
+  biquads         downsample      input           remix           stretch
+  chorus          earwax          loudness        repeat          swap
+  compand         echo            mcompand        reverb          synth
+  compandt        echos           mixer           reverse         tempo
+  contrast        fade            noiseprof       silence         tremolo
+  crop            fft4g           noisered        sinc            trim
+  dcshift         fir             output          skeleff         upsample
+  delay           firfit          overdrive       speed           vad
+  dft_filter      flanger         pad             splice          vol
 )
 set(formats_srcs
   8svx            dat             htk             s2-fmt          u2-fmt
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,16 +68,17 @@
 libsox_la_SOURCES += \
 	band.h bend.c biquad.c biquad.h biquads.c chorus.c compand.c crop.c \
 	compandt.c compandt.h contrast.c dcshift.c delay.c dft_filter.c \
-	dft_filter.h dither.c dither.h divide.c earwax.c echo.c \
-	echos.c effects.c effects.h effects_i.c effects_i_dsp.c fade.c fft4g.c \
-	fft4g.h fifo.h fir.c firfit.c flanger.c gain.c input.c \
-	ladspa.h ladspa.c loudness.c mcompand.c mcompand_xover.h mixer.c \
-	noiseprof.c noisered.c noisered.h output.c overdrive.c pad.c \
-	phaser.c rate.c rate_filters.h rate_half_fir.h rate_poly_fir0.h \
-	rate_poly_fir.h remix.c repeat.c reverb.c reverse.c silence.c \
-	sinc.c skeleff.c speed.c speexdsp.c splice.c stat.c stats.c \
-	stretch.c swap.c synth.c tempo.c tremolo.c trim.c vad.c vol.c \
-	ignore-warning.h upsample.c hilbert.c downsample.c
+	dft_filter.h dither.c dither.h divide.c downsample.c earwax.c \
+	echo.c echos.c effects.c effects.h effects_i.c effects_i_dsp.c \
+	fade.c fft4g.c fft4g.h fifo.h fir.c firfit.c flanger.c gain.c \
+	hilbert.c input.c ladspa.h ladspa.c loudness.c mcompand.c \
+	mcompand_xover.h mixer.c noiseprof.c noisered.c \
+	noisered.h output.c overdrive.c pad.c phaser.c rate.c \
+	rate_filters.h rate_half_fir.h rate_poly_fir0.h rate_poly_fir.h \
+	remix.c repeat.c reverb.c reverse.c silence.c sinc.c skeleff.c \
+	speed.c speexdsp.c splice.c stat.c stats.c stretch.c swap.c \
+	synth.c tempo.c tremolo.c trim.c upsample.c vad.c vol.c \
+	ignore-warning.h
 if HAVE_PNG
     libsox_la_SOURCES += spectrogram.c
 endif