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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/08/28 19:53:03

Modified files:
        src/audiofileio: audiofileio.pro 

Log message:
        * An absolute mess, but Ben want something too look at :-P
        * Added PeakDataReader class used to read peak data
        * Added peak_data_t typedef used by Peak and related classes
        * buffer management is moved completely into DecodeBuffer itself + 
related cleanups, needs more work
        * ReadSource and AudioClip further converted to TimeRef
        * Tons of bugs added

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/audiofileio.pro?cvsroot=traverso&r1=1.7&r2=1.8

Patches:
Index: audiofileio.pro
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/audiofileio.pro,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- audiofileio.pro     16 Aug 2007 07:50:39 -0000      1.7
+++ audiofileio.pro     28 Aug 2007 19:53:03 -0000      1.8
@@ -19,7 +19,8 @@
        decode/MadAudioReader.cpp \
        encode/AbstractAudioWriter.cpp \
        encode/SFAudioWriter.cpp \
-       encode/WPAudioWriter.cpp
+       encode/WPAudioWriter.cpp \
+       decode/PeakDataReader.cpp
 HEADERS = decode/AbstractAudioReader.h \
        decode/SFAudioReader.h \
        decode/FlacAudioReader.h \
@@ -29,7 +30,8 @@
        decode/MadAudioReader.h \
        encode/AbstractAudioWriter.h \
        encode/SFAudioWriter.h \
-       encode/WPAudioWriter.h
+       encode/WPAudioWriter.h \
+       decode/PeakDataReader.h
 macx{
     QMAKE_LIBDIR += /usr/local/qt/lib
 }
@@ -38,14 +40,14 @@
     INCLUDEPATH += ../../3thparty/include .
 }
 
-unix {
-       system(which relaytool 2>/dev/null >/dev/null) {
+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 {
+    }    else{
                DEFINES += RELAYTOOL_FLAC="'static const int 
libFLAC_is_present=1; static int __attribute__((unused)) 
libFLAC_symbol_is_present(char *) { return 1; }'"
                
                DEFINES += RELAYTOOL_MAD="'static const int 
libmad_is_present=1; static int __attribute__((unused)) 
libmad_symbol_is_present(char *) { return 1; }'"
@@ -54,10 +56,12 @@
        }
 }
 
-!unix {
+!unix{
        DEFINES += RELAYTOOL_FLAC="\"static const int libFLAC_is_present=1; 
static int __attribute__((unused)) libFLAC_symbol_is_present(char *) { return 
1; }\""
        
        DEFINES += RELAYTOOL_MAD="\"static const int libmad_is_present=1; 
static int __attribute__((unused)) libmad_symbol_is_present(char *) { return 1; 
}\""
        
        DEFINES += RELAYTOOL_VORBISFILE="\"static const int 
libvorbisfile_is_present=1; static int __attribute__((unused)) 
libvorbisfile_symbol_is_present(char *) { return 1; }\""
 }
+HEADERS -= PeakDataReader.h
+