[Traverso-commit] traverso/src base.pri audiofileio/audiofileio.p...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/14 04:12:57

Modified files:
        src            : base.pri 
        src/audiofileio: audiofileio.pro 
        src/audiofileio/decode: FlacAudioReader.cpp MadAudioReader.cpp 
                                VorbisAudioReader.cpp WPAudioReader.cpp 
        src/audiofileio/encode: AbstractAudioWriter.cpp 
        src/traverso   : ExportWidget.cpp traverso.pro 

Log message:
        Slightly modified version of tmorton's patch to use relaytool to 
soft-link the audio 
        codec libs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/audiofileio.pro?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/FlacAudioReader.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/MadAudioReader.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/VorbisAudioReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/WPAudioReader.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.66&r2=1.67

Patches:
Index: base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- base.pri    25 Jun 2007 13:32:28 -0000      1.40
+++ base.pri    14 Aug 2007 04:12:56 -0000      1.41
@@ -117,8 +117,15 @@
        
        system(which relaytool 2>/dev/null >/dev/null) {
                DEFINES += RELAYTOOL_JACK="'extern int libjack_is_present; 
extern int libjack_symbol_is_present(char *s);'"
+
+               DEFINES += RELAYTOOL_WAVPACK="'extern int 
libwavpack_is_present; extern int libwavpack_symbol_is_present(char *s);'"
        } else {
                DEFINES += RELAYTOOL_JACK="'static const int 
libjack_is_present=1; static int __attribute__((unused)) 
libjack_symbol_is_present(char *m) { return 1; }'"
+
+               # put WAVPACK def here so that we can check if it exists 
globally
+               # so that traverso/ExportWidget.cpp knows if it should offer
+               # WAVPACK as an export option
+               DEFINES += RELAYTOOL_WAVPACK="'static const int 
libwavpack_is_present=1; static int __attribute__((unused)) 
libwavpack_symbol_is_present(char *m) { return 1; }'"
        }
        
        contains(DEFINES, PRECOMPILED_HEADER):CONFIG += precompile_header
@@ -133,6 +140,11 @@
        
 }
 
+!unix {
+       # other systems have no relaytool
+       DEFINES += RELAYTOOL_WAVPACK="'static const int 
libwavpack_is_present=1; static int __attribute__((unused)) 
libwavpack_symbol_is_present(char *m) { return 1; }'"
+}
+
 macx {
        DEFINES += OSX_BUILD
        DEFINES += PORTAUDIO_SUPPORT

Index: audiofileio/audiofileio.pro
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/audiofileio.pro,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- audiofileio/audiofileio.pro 11 Aug 2007 21:45:28 -0000      1.3
+++ audiofileio/audiofileio.pro 14 Aug 2007 04:12:56 -0000      1.4
@@ -37,3 +37,19 @@
 win32{
     INCLUDEPATH += ../../3thparty/include .
 }
+
+unix {
+       system(which relaytool 2>/dev/null >/dev/null) {
+               DEFINES += RELAYTOOL_FLAC="'extern int libFLAC_is_present; 
extern int libFLAC_symbol_is_present(char *s);'"
+               
+               DEFINES += RELAYTOOL_MAD="'extern int libmad_is_present; extern 
int libmad_symbol_is_present(char *s);'"
+               
+               DEFINES += RELAYTOOL_VORBISFILE="'extern int 
libvorbisfile_is_present; extern int libvorbisfile_symbol_is_present(char *s);'"
+       } else {
+               DEFINES += RELAYTOOL_FLAC="'static const int 
libFLAC_is_present=1; static int __attribute__((unused)) 
libFLAC_symbol_is_present(char *m) { return 1; }'"
+               
+               DEFINES += RELAYTOOL_MAD="'static const int 
libmad_is_present=1; static int __attribute__((unused)) 
libmad_symbol_is_present(char *m) { return 1; }'"
+               
+               DEFINES += RELAYTOOL_VORBISFILE=="'static const int 
libvorbisfile_is_present=1; static int __attribute__((unused)) 
libvorbisfile_symbol_is_present(char *m) { return 1; }'"
+       }
+}

Index: audiofileio/decode/FlacAudioReader.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/FlacAudioReader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- audiofileio/decode/FlacAudioReader.cpp      4 Aug 2007 04:21:27 -0000       
1.2
+++ audiofileio/decode/FlacAudioReader.cpp      14 Aug 2007 04:12:56 -0000      
1.3
@@ -38,6 +38,8 @@
 #include "FLAC/stream_decoder.h"
 #endif
 
+RELAYTOOL_FLAC
+
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -398,6 +400,10 @@
 
 bool FlacAudioReader::can_decode(QString filename)
 {
+       if (!libFLAC_is_present) {
+               return false;
+       }
+       
        // buffer large enough to read an ID3 tag header
        char buf[10];
 

Index: audiofileio/decode/MadAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/MadAudioReader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- audiofileio/decode/MadAudioReader.cpp       4 Aug 2007 04:21:27 -0000       
1.2
+++ audiofileio/decode/MadAudioReader.cpp       14 Aug 2007 04:12:56 -0000      
1.3
@@ -26,6 +26,8 @@
 #include <QString>
 #include <QVector>
 
+RELAYTOOL_MAD
+
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -529,6 +531,10 @@
 
 bool MadAudioReader::can_decode(QString filename)
 {
+       if (!libmad_is_present) {
+               return false;
+       }
+       
        //
        // HACK:
        //

Index: audiofileio/decode/VorbisAudioReader.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/VorbisAudioReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- audiofileio/decode/VorbisAudioReader.cpp    31 Jul 2007 18:45:13 -0000      
1.1
+++ audiofileio/decode/VorbisAudioReader.cpp    14 Aug 2007 04:12:56 -0000      
1.2
@@ -28,6 +28,8 @@
 #include <fcntl.h>
 #endif
 
+RELAYTOOL_VORBISFILE
+
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -67,6 +69,10 @@
 
 bool VorbisAudioReader::can_decode(QString filename)
 {
+       if (!libvorbisfile_is_present) {
+               return false;
+       }
+       
        FILE* file = fopen(filename.toUtf8().data(), "rb");
        if (!file) {
                PERROR("Could not open file: %s.", filename.toUtf8().data());

Index: audiofileio/decode/WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/WPAudioReader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- audiofileio/decode/WPAudioReader.cpp        4 Aug 2007 04:21:27 -0000       
1.2
+++ audiofileio/decode/WPAudioReader.cpp        14 Aug 2007 04:12:57 -0000      
1.3
@@ -22,6 +22,8 @@
 #include "WPAudioReader.h"
 #include <QString>
 
+RELAYTOOL_WAVPACK
+
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -63,6 +65,10 @@
 
 bool WPAudioReader::can_decode(QString filename)
 {
+       if (!libwavpack_is_present) {
+               return false;
+       }
+       
        char error[80];
        
        WavpackContext *wp = WavpackOpenFileInput(filename.toUtf8().data(), 
error, OPEN_2CH_MAX, 1);

Index: audiofileio/encode/AbstractAudioWriter.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/encode/AbstractAudioWriter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- audiofileio/encode/AbstractAudioWriter.cpp  11 Aug 2007 21:45:28 -0000      
1.4
+++ audiofileio/encode/AbstractAudioWriter.cpp  14 Aug 2007 04:12:57 -0000      
1.5
@@ -25,6 +25,8 @@
 
 #include <QString>
 
+RELAYTOOL_WAVPACK
+
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -125,7 +127,7 @@
        if (type == "sf") {
                return new SFAudioWriter();
        }
-       else if (type == "wp") {
+       else if (libwavpack_is_present && type == "wp") {
                return new WPAudioWriter();
        }
        /*else if (type == "mad") {

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- traverso/ExportWidget.cpp   13 Aug 2007 12:15:24 -0000      1.52
+++ traverso/ExportWidget.cpp   14 Aug 2007 04:12:57 -0000      1.53
@@ -40,6 +40,8 @@
 #define CDRDAO_BIN     "cdrdao"
 #endif
 
+RELAYTOOL_WAVPACK
+
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -79,8 +81,10 @@
        audioTypeComboBox->insertItem(0, "WAV");
        audioTypeComboBox->insertItem(1, "AIFF");
        audioTypeComboBox->insertItem(2, "FLAC");
+       
+       if (libwavpack_is_present) {
        audioTypeComboBox->insertItem(3, "WAVPACK");
-//     audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
+       }
 
        bitdepthComboBox->setCurrentIndex(0);
 

Index: traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- traverso/traverso.pro       3 Aug 2007 02:39:36 -0000       1.66
+++ traverso/traverso.pro       14 Aug 2007 04:12:57 -0000      1.67
@@ -22,10 +22,6 @@
        -ltraversoplugins \
        -lsndfile \
        -lsamplerate \
-       -lvorbisfile \
-       -lmad \
-       -lwavpack \
-       -lFLAC \
        -lfftw3
 
 HEADERS += \
@@ -155,11 +151,30 @@
 
     contains(DEFINES, JACK_SUPPORT){
         system(which relaytool 2>/dev/null >/dev/null){
-            LIBS += `relaytool --multilink libjack.so.0 libjack-0.100.0.so.0 
--relay jack -ljack`
+            LIBS += $$system(relaytool --multilink libjack.so.0 
libjack-0.100.0.so.0 --relay jack -ljack)
         }        else{
             LIBS += -ljack
         }
     }
+
+    system(which relaytool 2>/dev/null >/dev/null) {
+        LIBS += $$system(relaytool --relay FLAC -lFLAC)
+        LIBS += $$system(relaytool --relay mad -lmad)
+        LIBS += $$system(relaytool --relay vorbisfile -lvorbisfile)
+        LIBS += $$system(relaytool --relay wavpack -lwavpack)
+    } else {
+        LIBS += -lvorbisfile \
+            -lmad \
+            -lFLAC \
+            -lwavpack
+    }
+}
+
+!unix { #non-unix systems don't have relaytool
+    LIBS += -lvorbisfile \
+        -lmad \
+        -lFLAC \
+        -lwavpack
 }
 
 macx{