File paulstretch-nomp3.patch of Package paulstretch

Overview Repositories Revisions Requests Users Attributes Meta

File paulstretch-nomp3.patch of Package paulstretch (Revision acf573cbd4084ff9607af29e0088fa5e)

Currently displaying revision acf573cbd4084ff9607af29e0088fa5e , Show latest

diff -up paulstretch-2.0/compile_linux_fftw.sh.nomp3 paulstretch-2.0/compile_linux_fftw.sh
--- paulstretch-2.0/compile_linux_fftw.sh.nomp3	2010-02-22 14:10:42.839651368 +0100
+++ paulstretch-2.0/compile_linux_fftw.sh	2010-02-22 14:11:56.016874329 +0100
@@ -6,7 +6,7 @@ fluid -c GUI.fl
 fluid -c FreeEditUI.fl
 
 g++ -ggdb GUI.cxx FreeEditUI.cxx *.cpp Input/*.cpp `fltk-config --cflags` \
- `fltk-config --ldflags`  -laudiofile -lfftw3f -lvorbisenc -lvorbisfile -lportaudio -lpthread -lmad -o $outfile
+ `fltk-config --ldflags`  -laudiofile -lfftw3f -lvorbisenc -lvorbisfile -lportaudio -lpthread -o $outfile
 
 rm -f GUI.h GUI.cxx FreeEditUI.h FreeEditUI.cxx
 
diff -up paulstretch-2.0/Control.cpp.nomp3 paulstretch-2.0/Control.cpp
--- paulstretch-2.0/Control.cpp.nomp3	2010-02-22 14:03:24.884617697 +0100
+++ paulstretch-2.0/Control.cpp	2010-02-22 14:04:16.296474000 +0100
@@ -48,7 +48,7 @@ Control::~Control(){
 bool Control::set_input_filename(string filename,FILE_TYPE intype){
 	InputS *ai=NULL;
 	if (intype==FILE_VORBIS) ai=new VorbisInputS;
-	if (intype==FILE_MP3) ai=new MP3InputS;
+//	if (intype==FILE_MP3) ai=new MP3InputS;
 	if (intype==FILE_WAV) ai=new AInputS;
 	if (!ai) return false;
 	wavinfo.filename=filename;
@@ -323,8 +323,8 @@ string Control::Render(string inaudio,st
 	switch(intype){
 		case FILE_VORBIS:ai=new VorbisInputS;
 						 break;
-		case FILE_MP3:ai=new MP3InputS;
-					  break;
+//		case FILE_MP3:ai=new MP3InputS;
+//					  break;
 		default:ai=new AInputS;
 	};
 	AOutputS ao;
diff -up paulstretch-2.0/Control.h.nomp3 paulstretch-2.0/Control.h
--- paulstretch-2.0/Control.h.nomp3	2010-02-22 14:06:27.249501132 +0100
+++ paulstretch-2.0/Control.h	2010-02-22 14:08:15.051004123 +0100
@@ -22,7 +22,7 @@
 #include "globals.h"
 #include "Input/AInputS.h"
 #include "Input/VorbisInputS.h"
-#include "Input/MP3InputS.h"
+//#include "Input/MP3InputS.h"
 #include "AOutputS.h"
 #include "VorbisOutputS.h"
 #include "ProcessedStretch.h"
diff -up paulstretch-2.0/Player.cpp.nomp3 paulstretch-2.0/Player.cpp
--- paulstretch-2.0/Player.cpp.nomp3	2010-02-22 14:04:51.028783526 +0100
+++ paulstretch-2.0/Player.cpp	2010-02-22 14:06:02.995790227 +0100
@@ -248,8 +248,8 @@ void Player::newtaskcheck(){
 		switch (task.intype){
 			case FILE_VORBIS:ai=new VorbisInputS;
 							 break;
-			case FILE_MP3:ai=new MP3InputS;
-						  break;
+//			case FILE_MP3:ai=new MP3InputS;
+//						  break;
 			default: ai=new AInputS;
 		};
 		if (ai->open(task.filename)){
diff -up paulstretch-2.0/Player.h.nomp3 paulstretch-2.0/Player.h
--- paulstretch-2.0/Player.h.nomp3	2010-02-22 14:09:26.997025995 +0100
+++ paulstretch-2.0/Player.h	2010-02-22 14:10:01.435303973 +0100
@@ -21,7 +21,7 @@
 #include <string>
 #include "Input/AInputS.h"
 #include "Input/VorbisInputS.h"
-#include "Input/MP3InputS.h"
+//#include "Input/MP3InputS.h"
 #include "ProcessedStretch.h"
 #include "Thread.h"
 #include "BinauralBeats.h"

Places

File paulstretch-nomp3.patch of Package paulstretch (Revision acf573cbd4084ff9607af29e0088fa5e)

Places