[Traverso-commit] traverso/src engine/defines.h traverso/ExportWi...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/09/24 17:39:07

Modified files:
        src/engine     : defines.h 
        src/traverso   : ExportWidget.cpp traverso.pro 

Log message:
        Relaytoolize -logg, -lvorbis, and -lvorbisfile
        Check the is_present_* flags in ExportWidget

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/defines.h?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.70&r2=1.71

Patches:
Index: engine/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/defines.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- engine/defines.h    24 Sep 2007 16:58:38 -0000      1.21
+++ engine/defines.h    24 Sep 2007 17:39:06 -0000      1.22
@@ -320,10 +320,22 @@
        extern int libmad_is_present;\
        extern int libmad_symbol_is_present(char *s);
        
+#define RELAYTOOL_OGG \
+       extern int libogg_is_present;\
+       extern int libogg_symbol_is_present(char *s);
+
+#define RELAYTOOL_VORBIS \
+       extern int libvorbis_is_present;\
+       extern int libvorbis_symbol_is_present(char *s);
+
 #define RELAYTOOL_VORBISFILE \
        extern int libvorbisfile_is_present;\
        extern int libvorbisfile_symbol_is_present(char *s);
 
+#define RELAYTOOL_VORBISENC \
+       extern int libvorbisenc_is_present;\
+       extern int libvorbisenc_symbol_is_present(char *s);
+
 
 #else
 
@@ -344,10 +356,22 @@
        static const int libmad_is_present=1;\
        static int __attribute__((unused)) libmad_symbol_is_present(char *) { 
return 1; }
        
+#define RELAYTOOL_OGG \
+       static const int libogg_is_present=1;\
+       static int __attribute__((unused)) libogg_symbol_is_present(char *) { 
return 1; }
+
+#define RELAYTOOL_VORBIS \
+       static const int libvorbis_is_present=1;\
+       static int __attribute__((unused)) libvorbis_symbol_is_present(char *) 
{ return 1; }
+
 #define RELAYTOOL_VORBISFILE \
        static const int libvorbisfile_is_present=1;\
        static int __attribute__((unused)) libvorbisfile_symbol_is_present(char 
*) { return 1; }
        
+#define RELAYTOOL_VORBISENC \
+       static const int libvorbisenc_is_present=1;\
+       static int __attribute__((unused)) libvorbisenc_symbol_is_present(char 
*) { return 1; }
+
 #define RELAYTOOL_MP3LAME \
        static const int libmp3lame_is_present=1;\
        static int __attribute__((unused)) libmp3lame_symbol_is_present(char *) 
{ return 1; }

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- traverso/ExportWidget.cpp   24 Sep 2007 00:57:51 -0000      1.60
+++ traverso/ExportWidget.cpp   24 Sep 2007 17:39:07 -0000      1.61
@@ -41,6 +41,9 @@
 #endif
 
 RELAYTOOL_WAVPACK
+RELAYTOOL_FLAC
+RELAYTOOL_MP3LAME
+RELAYTOOL_VORBISENC
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -80,12 +83,18 @@
        
        audioTypeComboBox->addItem("WAV", "wav");
        audioTypeComboBox->addItem("AIFF", "aiff");
+       if (libFLAC_is_present) {
        audioTypeComboBox->addItem("FLAC", "flac");
+       }
        if (libwavpack_is_present) {
                audioTypeComboBox->addItem("WAVPACK", "wavpack");
        }
+       if (libmp3lame_is_present) {
        audioTypeComboBox->addItem("MP3", "mp3");
+       }
+       if (libvorbisenc_is_present) {
        audioTypeComboBox->addItem("OGG", "ogg");
+       }
        
        bitdepthComboBox->setCurrentIndex(bitdepthComboBox->findData(16));
        channelComboBox->setCurrentIndex(channelComboBox->findData(2));

Index: traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- traverso/traverso.pro       24 Sep 2007 16:16:05 -0000      1.70
+++ traverso/traverso.pro       24 Sep 2007 17:39:07 -0000      1.71
@@ -22,9 +22,6 @@
        -ltraversoplugins \
        -lsndfile \
        -lsamplerate \
-       -lvorbis \
-       -lvorbisenc \
-       -logg \
        -lfftw3
 
 HEADERS += \
@@ -164,10 +161,16 @@
         LIBS += $$system(relaytool --relay FLAC -lFLAC)
         LIBS += $$system(relaytool --relay mad -lmad)
         LIBS += $$system(relaytool --relay mp3lame -lmp3lame)
+        LIBS += $$system(relaytool --relay ogg -logg)
+        LIBS += $$system(relaytool --relay vorbis -lvorbis)
         LIBS += $$system(relaytool --relay vorbisfile -lvorbisfile)
+        LIBS += $$system(relaytool --relay vorbisenc -lvorbisenc)
         LIBS += $$system(relaytool --relay wavpack -lwavpack)
     } else {
-        LIBS += -lvorbisfile \
+        LIBS += -logg \
+            -lvorbis \
+            -lvorbisfile \
+            -lvorbisenc \
             -lmad \
             -lmp3lame \
             -lFLAC \
@@ -176,7 +179,10 @@
 }
 
 !unix { #non-unix systems don't have relaytool
-    LIBS += -lvorbisfile \
+    LIBS += -logg \
+        -lvorbis \
+        -lvorbisfile \
+        -lvorbisenc \
         -lmad \
         -lmp3lame \
         -lFLAC \