shithub: sox

Download patch

ref: 81e2aac1c3558b50ac82bba683070b82c35ae9dc
parent: 647cc7f95737633fcad12cb342ad149624372a22
author: cbagwell <cbagwell>
date: Tue Apr 20 21:04:09 EDT 1999

Various fixes

--- a/Makefile.dos
+++ b/Makefile.dos
@@ -25,7 +25,8 @@
 
 
 # The following defines tell where compiler files are kept, not where
-# things should be installed like Unix usually specifies.
+# things should be installed like Unix usually specifies.  If your using
+# Microsoft Compilers then you don't need these.
 BINDIR  = d:\tc\bin
 LIBDIR  = d:\tc\lib
 INCDIR  = d:\tc\include
@@ -47,6 +48,10 @@
 CFLAGS  = -DDOS -DHAVE_GETOPT -D__STDC__=1 -a -c -mh -G -O -v -N
 LFLAGS  = -v -mh
 
+.c.obj:
+	$(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
+	$(LDD) libst -$* +$*
+
 # MS VC needs the following. /AL uses large memory model.
 #CC	= cl
 #LDD	= lib
@@ -53,9 +58,10 @@
 #CFLAGS	= -DDOS -D__STDC__=1 -DHAVE_GETOPT -c -O /AL /Gt8192
 #LFLAGS	= /AL /Gt8192
 
-.c.obj:
-       $(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
-       $(LDD) libst -$* +$*
+# When using MS VC, comment out above rule for .c.obj and use this as well
+#.c.obj:
+#       $(CC) $(CFLAGS) $*.c
+#       $(LDD) libst -+$*,,
 
 all: sox.exe
 
--- a/TODO
+++ b/TODO
@@ -45,6 +45,11 @@
     These are currently thrown away.  Printing them out, carrying them
     forward, and an to add new ones would be handy.
 
+  o Add support for .TXT format as Cooledit supports.  Not really fit for
+    graphing since it is only a stream of ascii sample values but some
+    program appear to like it.  Also has a much nicer header.
+    http://lab.chass.utoronto.ca/damion/audio/coolwav.htm
+
   o Update auto file type to include detection of .wve and .smp files.
 
   o This software wants to be a dataflow system with signal
--- a/configure
+++ b/configure
@@ -1847,9 +1847,7 @@
 if test ! -f monkey.au; then cp ${srcdir}/monkey.au monkey.au; fi
 if test ! -f monkey.voc; then cp ${srcdir}/monkey.voc monkey.voc; fi
 
-touch .depend
-
 echo
-echo "Configure finished.  Do 'make depend; make' to compile SOX."
+echo "Configure finished.  Do 'make; make install' to compile and install SoX."
 echo
 
--- a/configure.in
+++ b/configure.in
@@ -254,7 +254,7 @@
 if test ! -f monkey.voc; then cp ${srcdir}/monkey.voc monkey.voc; fi
 
 echo
-echo "Configure finished.  Do 'make; make install' to compile and install SOX."
+echo "Configure finished.  Do 'make; make install' to compile and install SoX."
 echo
 
 dnl Local Variables:
--- a/sox.1
+++ b/sox.1
@@ -95,7 +95,7 @@
 .br
 	stat [ \fIdebug\fB | \fI-v\fB ]
 .br
-	swap [ 1 2 3 4 ]
+	swap [ \fI1 2 3 4\fB ]
 .br
 	vibro \fIspeed \fB[ \fIdepth\fB ]
 .SH DESCRIPTION
@@ -676,7 +676,7 @@
 This is mainly only of use in tracking down endian problems that
 creep in to sox on cross-platform versions.
 .TP 10
-swap [1 2 3 4]
+swap [ \fI1 2 3 4\fB ]
 Swap channels in multi-channel sound files.  In files with more than 2
 channels you may specify the order that the channels should be rearranged
 in.
@@ -734,5 +734,5 @@
 The version of Sox that accompanies this manual page is support by 
 Chris Bagwell (cbagwell@sprynet.com).  Please refer any questions 
 regarding it to this address.  You may obtain the latest version at the 
-the web site http://home.sprynet.com/~cbagwell/projects.html
+the web site http://home.sprynet.com/~cbagwell/sox.html
 
--- a/sox.txt
+++ b/sox.txt
@@ -47,6 +47,7 @@
 	    reverse
 	    split
 	    stat [ debug | -v ]
+	    swap [ 1 2 3 4 ]
 	    vibro speed [ depth ]
 
 DESCRIPTION
@@ -57,7 +58,6 @@
        The option syntax is a little grotty, but in essence:
 	    sox file.au file.voc
        translates a sound sample in SUN Sparc .AU format  into	a
-       SoundBlaster .VOC file, while
 
 
 
@@ -70,6 +70,7 @@
 SoX(1)							   SoX(1)
 
 
+       SoundBlaster .VOC file, while
 	    sox -v 0.5 file.au -r 12000 file.voc rate
        does  the  same	format	translation  but  also lowers the
        amplitude by 1/2 and changes the sampling rate  from  8000
@@ -123,7 +124,6 @@
 
        -h	 Print version number and usage information.
 
-       -p	 Run  in  preview  mode	 and run fast.	This will
 
 
 
@@ -136,6 +136,7 @@
 SoX(1)							   SoX(1)
 
 
+       -p	 Run  in  preview  mode	 and run fast.	This will
 		 somewhat speed up sox when the output format has
 		 a  different  number of channels and a different
 		 rate then the input file.  The	 order	that  the
@@ -192,7 +193,6 @@
 
 
 
-
 			  March 5, 1999				3
 
 
@@ -674,27 +674,33 @@
 		 use  in tracking down endian problems that creep
 		 in to sox on cross-platform versions.
 
+       swap [ 1 2 3 4 ]
+		 Swap channels in multi-channel sound files.   In
+		 files	with more than 2 channels you may specify
+		 the order that the channels should be rearranged
+		 in.
+
        vibro speed  [ depth ]
-		 Add the world-famous  Fender  Vibro-Champ  sound
+		 Add  the  world-famous	 Fender Vibro-Champ sound
 		 effect to a sound sample by using a sine wave as
 		 the volume knob.  Speed gives the Hertz value of
-		 the  wave.   This must be under 30.  Depth gives
-		 the amount the volume is cut into  by	the  sine
-		 wave,	ranging 0.0 to 1.0 and defaulting to 0.5.
+		 the wave.  This must be under 30.   Depth  gives
+		 the  amount  the  volume is cut into by the sine
+		 wave, ranging 0.0 to 1.0 and defaulting to  0.5.
 
-       Sox enforces certain effects.  If the two files have  dif-
+       Sox  enforces certain effects.  If the two files have dif-
        ferent sampling rates, the requested effect must be one of
-       copy, or rate, If the two files have different numbers  of
+       copy,  or rate, If the two files have different numbers of
        channels, the avg effect must be requested.
 
 BUGS
-       The  syntax  is horrific.  It's very tempting to include a
-       default system that allows an effect name as  the  program
-       name  and just pipes a sound sample from standard input to
-       standard output, but the problem of inputting  the  sample
+       The syntax is horrific.	It's very tempting to  include	a
+       default	system	that allows an effect name as the program
+       name and just pipes a sound sample from standard input  to
+       standard	 output,  but the problem of inputting the sample
        rates makes this unworkable.
 
-       Please  report  any  bugs  found in this version of sox to
+       Please report any bugs found in this  version  of  sox  to
        Chris Bagwell (cbagwell@sprynet.com)
 
 FILES
@@ -702,25 +708,19 @@
        play(1), rec(1)
 
 NOTICES
-       The  echoplex  effect  is:  Copyright  (C)  1989	 by   Jef
+       The   echoplex  effect  is:  Copyright  (C)  1989  by  Jef
        Poskanzer.
 
        Permission to use, copy, modify, and distribute this soft-
        ware and its documentation for any purpose and without fee
-       is  hereby  granted,  provided  that  the  above copyright
-       notice appear in all copies and that both  that	copyright
-       notice  and  this  permission  notice appear in supporting
-       documentation.  This software is provided "as is"  without
+       is hereby  granted,  provided  that  the	 above	copyright
+       notice  appear  in all copies and that both that copyright
+       notice and this permission  notice  appear  in  supporting
+       documentation.	This software is provided "as is" without
        express or implied warranty.
 
-       The  version  of	 Sox that accompanies this manual page is
-       support by Chris Bagwell	 (cbagwell@sprynet.com).   Please
-       refer any questions regarding it to this address.  You may
-       obtain  the  latest  version   at   the	 the   web   site
-       http://home.sprynet.com/~cbagwell/projects.html
 
 
-
 			  March 5, 1999			       11
 
 
@@ -730,11 +730,11 @@
 SoX(1)							   SoX(1)
 
 
-
-
-
-
-
+       The version of Sox that accompanies this	 manual	 page  is
+       support	by  Chris Bagwell (cbagwell@sprynet.com).  Please
+       refer any questions regarding it to this address.  You may
+       obtain	the   latest   version	 at   the  the	web  site
+       http://home.sprynet.com/~cbagwell/sox.html