diff -ru sox.20050917-inst8/README.interactive sox.20050917-inst9/README.interactive --- sox.20050917-inst8/README.interactive 2014-05-08 12:52:21.000000000 +0200 +++ sox.20050917-inst9/README.interactive 2014-12-13 22:29:43.550821809 +0100 @@ -181,3 +181,6 @@ the compiled in numbers to make the program behaviour consistent. 2014-05-07 print time difference between beginning and ending tags, the b-e tags pairs can be nested +removed -O2 by hand, fixes crashes + +2014-12-13 use "-n sox" with padsp, fixes silence in Debian pulseaudio diff -ru sox.20050917-inst8/scripts/myplay sox.20050917-inst9/scripts/myplay --- sox.20050917-inst8/scripts/myplay 2009-05-05 14:38:30.000000000 +0200 +++ sox.20050917-inst9/scripts/myplay 2007-02-21 22:01:08.000000000 +0100 @@ -12,9 +12,8 @@ start=`date '+%s'` echo "start $1 "`date` >> $log -~/bin/sox -I "$1" $eatbuf -t ossdsp /dev/dsp stretch 0.333333 vol 0 dB -#~/bin/sox -I "$1" $eatbuf -t alsa pulse stretch 0.333333 vol 0 dB -#TODO: read total pauses value seconds? +~/bin/sox -I "$1" $eatbuf -t ossdsp /dev/dsp stretch 0.333333 vol -10 dB +#TODO: read total pauses length in seconds? end=`date '+%s'` tdiff=$(( $end - $start )) diff -ru sox.20050917-inst8/scripts/sox sox.20050917-inst9/scripts/sox --- sox.20050917-inst8/scripts/sox 2014-05-07 22:32:34.000000000 +0200 +++ sox.20050917-inst9/scripts/sox 2014-12-13 22:17:55.188640216 +0100 @@ -10,4 +10,6 @@ # 2014-03-20? powrót do padsp ##padsp /home/rzm/src/sox.20050917-inst6/src/sox $* # 2014-05-07 nowa wersja, z długością obsz. tagowanego -padsp /home/rzm/src/sox.20050917-inst7/src/sox $* +padsp /home/rzm/src/sox.20050917-inst8/src/sox $* +# 2014-12-13 z padsp jest cisza, nazwa pomaga +padsp -n sox /home/rzm/src/sox.20050917-inst9/src/sox $* diff -ru sox.20050917-inst8/src/gsm/Makefile sox.20050917-inst9/src/gsm/Makefile --- sox.20050917-inst8/src/gsm/Makefile 2014-10-15 17:40:10.000000000 +0200 +++ sox.20050917-inst9/src/gsm/Makefile 2014-12-20 19:49:12.663288620 +0100 @@ -46,10 +46,10 @@ # Build macros. -##CFLAGS = -g -O2 -Wall -DHAVE_CONFIG_H $(SASR) $(MULHAC) $(FAST) $(LTP_CUT) $(WAV49) -I$(top_srcdir)/gsm +#CFLAGS = -g -O2 -Wall -DHAVE_CONFIG_H $(SASR) $(MULHAC) $(FAST) $(LTP_CUT) $(WAV49) -I$(top_srcdir)/gsm CFLAGS = -g -Wall -DHAVE_CONFIG_H $(SASR) $(MULHAC) $(FAST) $(LTP_CUT) $(WAV49) -I$(top_srcdir)/gsm LDFLAGS = -LIBS = -lvorbisfile -lvorbisenc -lvorbis -logg -lm -lmad -lasound +LIBS = -lvorbisfile -lvorbisenc -lvorbis -logg -lm -lmad -lmp3lame -lasound # Objects. diff -ru sox.20050917-inst8/src/Makefile sox.20050917-inst9/src/Makefile --- sox.20050917-inst8/src/Makefile 2014-10-15 17:39:50.000000000 +0200 +++ sox.20050917-inst9/src/Makefile 2014-12-20 19:49:19.715343321 +0100 @@ -25,11 +25,11 @@ LN_S = ln -s # Build macros. -##CFLAGS = -g -O2 -Wall -I$(srcdir) -I$(builddir) -DINTERACTIVE -DRZM -DCOMMUNICATION -DTAGGING +#CFLAGS = -g -O2 -Wall -I$(srcdir) -I$(builddir) -DINTERACTIVE -DRZM -DCOMMUNICATION -DTAGGING CFLAGS = -g -Wall -I$(srcdir) -I$(builddir) -DINTERACTIVE -DRZM -DCOMMUNICATION -DTAGGING CPPFLAGS = -I/lib/modules/3.2.0-4-amd64/build/include LDFLAGS = -L. -LIBS = -lst -lvorbisfile -lvorbisenc -lvorbis -logg -lm -lmad -lasound -lncurses +LIBS = -lst -lvorbisfile -lvorbisenc -lvorbis -logg -lm -lmad -lmp3lame -lasound -lncurses # Other macros. diff -ru sox.20050917-inst8/src/stconfig.h sox.20050917-inst9/src/stconfig.h --- sox.20050917-inst8/src/stconfig.h 2014-05-07 23:45:38.000000000 +0200 +++ sox.20050917-inst9/src/stconfig.h 2014-12-13 22:20:56.987390453 +0100 @@ -41,7 +41,7 @@ #define HAVE_INTTYPES_H 1 /* Define if you have LAME (LAME Ain't an MP3 Encoder) library installed */ -/* #undef HAVE_LAME */ +#define HAVE_LAME 1 /* Define to 1 if you have the `m' library (-lm). */ #define HAVE_LIBM 1 diff -ru sox.20050917-inst8/test/Makefile sox.20050917-inst9/test/Makefile --- sox.20050917-inst8/test/Makefile 1999-12-07 17:57:48.000000000 +0100 +++ sox.20050917-inst9/test/Makefile 2014-12-20 19:49:40.203502267 +0100 @@ -3,7 +3,8 @@ # Uncomment the following if you need a specific compiler. #CC=gcc -CFLAGS:=-O2 -Wall -L../ +#CFLAGS:=-O2 -Wall -L../ +CFLAGS:=-Wall -L../ LDFLAGS:=-s LIBS:=-lm .