shithub: sox

Info  •  Files  •  Log  •  Branches

More dos and makefile updates.

--- a/Makefile.dos

+++ b/Makefile.dos

@@ -15,9 +15,10 @@

 	  hcom.obj maud.obj oss.obj raw.obj sf.obj smp.obj \

 	  sndrtool.obj sunaudio.obj tx16w.obj voc.obj wav.obj wve.obj

-EOBJ	= avg.obj band.obj chorus.obj compand.obj copy.obj cut.obj \

-	  deemphas.obj dyn.obj echo.obj echos.obj filter.obj flanger.obj \

-          highp.obj lowp.obj map.obj mask.obj phaser.obj pick.obj polyphas.obj \

+EOBJ	= avg.obj band.obj bandpass.obj breject.obj btrworth.obj chorus.obj \

+	  compand.obj copy.obj cut.obj deemphas.obj dyn.obj echo.obj \

+	  echos.obj filter.obj flanger.obj highp.obj highpass.obj lowp.obj \

+          lowpass.obj map.obj mask.obj phaser.obj pick.obj polyphas.obj \

 	  rate.obj resample.obj reverb.obj reverse.obj split.obj \

 	  stat.obj swap.obj vibro.obj

@@ -27,9 +28,9 @@

 # The following defines tell where compiler files are kept, not where

 # 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

+BINDIR  = c:\tc

+LIBDIR  = c:\tc\lib

+INCDIR  = c:\tc\include

 #BINDIR	= d:\bc\bin

 #LIBDIR	= d:\bc\lib

@@ -45,7 +46,7 @@

 CC      = $(BINDIR)\tcc

 #CC      = $(BINDIR)\bcc

 LDD	= $(BINDIR)\tlib

-CFLAGS  = -DDOS -DHAVE_GETOPT -D__STDC__=1 -a -c -mh -G -O -v -N

+CFLAGS  = -DDOS -DHAVE_MEMMOVE -D__STDC__=1 -a -c -mh -G -O -v -N

 LFLAGS  = -v -mh

 .c.obj:

@@ -55,7 +56,7 @@

 # MS VC needs the following. /AL uses large memory model.

 #CC	= cl

 #LDD	= lib

-#CFLAGS	= -DDOS -D__STDC__=1 -DHAVE_GETOPT -c -O /AL /Gt8192

+#CFLAGS	= -DDOS -DHAVE_MEMMOVE -D__STDC__=1 -c -O /AL /Gt8192

 #LFLAGS	= /AL /Gt8192

 # When using MS VC, comment out above rule for .c.obj and use this as well

--- a/Makefile.gcc

+++ b/Makefile.gcc

@@ -30,12 +30,13 @@

 FOBJ	= 8svx.o aiff.o alsa.o au.o auto.o avr.o cdr.o cvsd.o dat.o \

 	  g721.o g723_24.o g723_40.o g72x.o gsm.o hcom.o maud.o oss.o raw.o \

-	  sbdsp.o sf.o smp.o sndrtool.o sunaudio.o tx16w.o voc.o wav.o wve.o

+	  sf.o smp.o sndrtool.o sunaudio.o tx16w.o voc.o wav.o wve.o

-EOBJ	= avg.o band.o chorus.o compand.o copy.o cut.o deemphas.o dyn.o echo.o \

-	  echos.o flanger.o highp.o lowp.o map.o mask.o phaser.o pick.o \

-	  polyphas.o rate.o resample.o reverb.o reverse.o split.o \

-	  stat.o swap.o vibro.o

+EOBJ    = avg.o band.o bandpass.o breject.o btrworth.o chorus.o compand.o \

+          copy.o cut.o deemphas.o dyn.o echo.o echos.o filter.o flanger.o \

+          highp.o highpass.o lowp.o lowpass.o map.o mask.o phaser.o pick.o \

+          polyphas.o rate.o resample.o reverb.o reverse.o split.o \

+          stat.o swap.o vibro.o

 SOUNDLIB = libst.a

 LIBOBJS = $(FOBJ) $(EOBJ) handlers.o libst.o misc.o util.o getopt.o

--- a/src/compand.c

+++ b/src/compand.c

@@ -103,7 +103,7 @@

       l->transferIns[tfers-1] = 1.0; l->transferOuts[tfers-1] = 1.0;

       s = strtok(argv[1], ","); i = 1;

       do {

-	if (!strcasecmp(s, "-inf"))

+	if (!strcmp(s, "-inf"))

 	  fail("Input signals of zero level must always generate zero output");

 	l->transferIns[i]  = pow(10.0, atof(s)/20.0);

 	if (l->transferIns[i] > 1.0)

@@ -115,7 +115,7 @@

 	  fail("Transfer function points don't have strictly ascending "

 	       "input amplitude");

 	s = strtok(NULL, ",");

-	l->transferOuts[i] = strcasecmp(s, "-inf") ?

+	l->transferOuts[i] = strcmp(s, "-inf") ?

 	                       pow(10.0, atof(s)/20.0) : 0;

 	s = strtok(NULL, ",");

 	++i;