[Traverso-commit] traverso/src audiofileio/audiofileio.pro audiof...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/30 15:10:42

Modified files:
        src/audiofileio: audiofileio.pro 
        src/audiofileio/decode: AbstractAudioReader.cpp 
        src/audiofileio/encode: AbstractAudioWriter.cpp 
        src/traverso/dialogs: ExportDialog.cpp 
        src/traverso   : traverso.pro 

Log message:
        * Added 2 defines for compiling mp3 decode/encode support at compile 
time

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/audiofileio.pro?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.78&r2=1.79

Patches:
Index: audiofileio/audiofileio.pro
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/audiofileio.pro,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- audiofileio/audiofileio.pro 27 Oct 2007 17:57:15 -0000      1.16
+++ audiofileio/audiofileio.pro 30 Oct 2007 15:10:41 -0000      1.17
@@ -46,3 +46,12 @@
     INCLUDEPATH += ../../3thparty/include .
 }
 
+!contains(DEFINES, MP3_ENCODE_SUPPORT) {
+       SOURCES -= encode/LameAudioWriter.cpp
+       HEADERS -= encode/LameAudioWriter.h
+}
+
+!contains(DEFINES, MP3_DECODE_SUPPORT) {
+       SOURCES -= decode/MadAudioReader.cpp
+       HEADERS -= decode/MadAudioReader.h
+}

Index: audiofileio/decode/AbstractAudioReader.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- audiofileio/decode/AbstractAudioReader.cpp  22 Oct 2007 18:43:59 -0000      
1.18
+++ audiofileio/decode/AbstractAudioReader.cpp  30 Oct 2007 15:10:42 -0000      
1.19
@@ -22,7 +22,9 @@
 #include "AbstractAudioReader.h"
 #include "SFAudioReader.h"
 #include "FlacAudioReader.h"
+#if defined MP3_DECODE_SUPPORT
 #include "MadAudioReader.h"
+#endif
 #include "WPAudioReader.h"
 #include "VorbisAudioReader.h"
 #include "ResampleAudioReader.h"
@@ -131,9 +133,13 @@
                        newReader = new FlacAudioReader(filename);
                } else if (decoder == "vorbis") {
                        newReader = new VorbisAudioReader(filename);
-               } else if (decoder == "mad") {
+               }
+#if defined MP3_DECODE_SUPPORT
+               else if (decoder == "mad") {
                        newReader = new MadAudioReader(filename);
                }
+#endif
+               
                if (newReader && !newReader->is_valid()) {
                        PERROR("new %s reader is invalid! (channels: %d, 
frames: %d)", (const char *)(newReader->decoder_type().toUtf8()), 
newReader->get_num_channels(), newReader->get_nframes());
                        delete newReader;
@@ -155,9 +161,11 @@
                else if (SFAudioReader::can_decode(filename)) {
                        newReader = new SFAudioReader(filename);
                }
+#if defined MP3_DECODE_SUPPORT
                else if (MadAudioReader::can_decode(filename)) {
                        newReader = new MadAudioReader(filename);
                }
+#endif
        }
        
        if (newReader && !newReader->is_valid()) {

Index: audiofileio/encode/AbstractAudioWriter.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- audiofileio/encode/AbstractAudioWriter.cpp  24 Sep 2007 00:57:51 -0000      
1.10
+++ audiofileio/encode/AbstractAudioWriter.cpp  30 Oct 2007 15:10:42 -0000      
1.11
@@ -22,15 +22,17 @@
 #include "AbstractAudioWriter.h"
 #include "SFAudioWriter.h"
 #include "WPAudioWriter.h"
+#if defined MP3_ENCODE_SUPPORT
 #include "LameAudioWriter.h"
+#endif
 #include "VorbisAudioWriter.h"
 #include "FlacAudioWriter.h"
 
 #include <QString>
 
-RELAYTOOL_WAVPACK
-RELAYTOOL_MP3LAME
-RELAYTOOL_FLAC
+RELAYTOOL_WAVPACK;
+RELAYTOOL_MP3LAME;
+RELAYTOOL_FLAC;
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -139,9 +141,11 @@
        else if (libwavpack_is_present && type == "wavpack") {
                return new WPAudioWriter();
        }
+#if defined MP3_ENCODE_SUPPORT
        else if (libmp3lame_is_present && type == "lame") {
                return new LameAudioWriter();
        }
+#endif
        else if (type == "vorbis") {
                return new VorbisAudioWriter();
        }

Index: traverso/dialogs/ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- traverso/dialogs/ExportDialog.cpp   22 Oct 2007 16:49:44 -0000      1.6
+++ traverso/dialogs/ExportDialog.cpp   30 Oct 2007 15:10:42 -0000      1.7
@@ -87,9 +87,11 @@
        if (libwavpack_is_present) {
                audioTypeComboBox->addItem("WAVPACK", "wavpack");
        }
+#if defined MP3_ENCODE_SUPPORT
        if (libmp3lame_is_present) {
                audioTypeComboBox->addItem("MP3", "mp3");
        }
+#endif
        if (libvorbisenc_is_present) {
                audioTypeComboBox->addItem("OGG", "ogg");
        }

Index: traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- traverso/traverso.pro       20 Oct 2007 13:09:28 -0000      1.78
+++ traverso/traverso.pro       30 Oct 2007 15:10:42 -0000      1.79
@@ -229,3 +229,10 @@
 
     POST_TARGETDEPS += ../engine ../commands ../core ../audiofileio ../plugins 
songcanvas
 }
+
+!contains(DEFINES, MP3_ENCODE_SUPPORT){
+       LIBS -= -lmp3lame
+}
+!contains(DEFINES, MP3_DECODE_SUPPORT){
+       LIBS -= -lmad
+}