87 lines
3.6 KiB
Diff
87 lines
3.6 KiB
Diff
|
diff -Nru traverso-0.42.0/CMakeLists.txt traverso-0.42.0-gil/CMakeLists.txt
|
||
|
|
--- traverso-0.42.0/CMakeLists.txt 2007-12-10 13:51:49.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/CMakeLists.txt 2008-08-26 16:47:58.000000000 +0200
|
||
|
|
@@ -249,6 +249,7 @@
|
||
|
|
IF(NOT HAVE_LAME_H)
|
||
|
|
MESSAGE(FATAL_ERROR "MP3 encoding support requested, but mp3 development headers (lame.h) could not be found!\nPlease install the lame development package (Usually called liblame-dev), remove CMakeCache.txt and run cmake again")
|
||
|
|
ENDIF(NOT HAVE_LAME_H)
|
||
|
|
+ IF(LAME_FOUND)
|
||
|
|
LIST(APPEND TRAVERSO_DEFINES -DMP3_ENCODE_SUPPORT)
|
||
|
|
MESSAGE("-- Building with mp3 encoding support enabled")
|
||
|
|
SET(HAVE_MP3_ENCODING TRUE)
|
||
|
|
diff -Nru traverso-0.42.0/src/3rdparty/slv2/CMakeLists.txt traverso-0.42.0-gil/src/3rdparty/slv2/CMakeLists.txt
|
||
|
|
--- traverso-0.42.0/src/3rdparty/slv2/CMakeLists.txt 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/3rdparty/slv2/CMakeLists.txt 2008-08-26 16:55:16.000000000 +0200
|
||
|
|
@@ -25,4 +25,4 @@
|
||
|
|
|
||
|
|
|
||
|
|
ADD_LIBRARY(${TRAVERSO_SLV2_LIBRARY} STATIC ${TRAVERSO_SLV2_SOURCES})
|
||
|
|
-
|
||
|
|
+TARGET_LINK_LIBRARIES(${TRAVERSO_SLV2_LIBRARY} -lrdf)
|
||
|
|
\ No newline at end of file
|
||
|
|
diff -Nru traverso-0.42.0/src/common/fpu.cc traverso-0.42.0-gil/src/common/fpu.cc
|
||
|
|
--- traverso-0.42.0/src/common/fpu.cc 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/common/fpu.cc 2008-08-26 17:01:58.000000000 +0200
|
||
|
|
@@ -79,7 +79,7 @@
|
||
|
|
#ifdef NO_POSIX_MEMALIGN
|
||
|
|
if ((fxbuf = (char *) malloc(512)) == 0)
|
||
|
|
#else
|
||
|
|
- if (posix_memalign ((void**)&fxbuf, 16, 512))
|
||
|
|
+ if (posix_memalign ((void**)temp, 16, 512))
|
||
|
|
#endif
|
||
|
|
{
|
||
|
|
printf("FPU() ERROR: cannot allocate 16 byte aligned buffer for h/w feature detection");
|
||
|
|
diff -Nru traverso-0.42.0/src/core/ReadSource.cpp traverso-0.42.0-gil/src/core/ReadSource.cpp
|
||
|
|
--- traverso-0.42.0/src/core/ReadSource.cpp 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/core/ReadSource.cpp 2008-08-26 17:06:28.000000000 +0200
|
||
|
|
@@ -35,7 +35,9 @@
|
||
|
|
// Always put me below _all_ includes, this is needed
|
||
|
|
// in case we run with memory leak detection enabled!
|
||
|
|
#include "Debugger.h"
|
||
|
|
-
|
||
|
|
+#ifndef LONG_LONG_MAX
|
||
|
|
+#define LONG_LONG_MAX __LONG_LONG_MAX__
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/**
|
||
|
|
* \class ReadSource
|
||
|
|
diff -Nru traverso-0.42.0/src/traverso/CMakeLists.txt traverso-0.42.0-gil/src/traverso/CMakeLists.txt
|
||
|
|
--- traverso-0.42.0/src/traverso/CMakeLists.txt 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/traverso/CMakeLists.txt 2008-08-26 16:59:54.000000000 +0200
|
||
|
|
@@ -274,11 +274,11 @@
|
||
|
|
)
|
||
|
|
ENDIF(HAVE_ALSA)
|
||
|
|
|
||
|
|
-IF(HAVE_ALSA)
|
||
|
|
+IF(HAVE_JACK)
|
||
|
|
TARGET_LINK_LIBRARIES(traverso
|
||
|
|
${JACK_LIB}
|
||
|
|
)
|
||
|
|
-ENDIF(HAVE_ALSA)
|
||
|
|
+ENDIF(HAVE_JACK)
|
||
|
|
|
||
|
|
IF(USE_PCH)
|
||
|
|
ADD_DEPENDENCIES(traverso precompiled_headers)
|
||
|
|
diff -Nru traverso-0.42.0/src/traverso/Main.cpp traverso-0.42.0-gil/src/traverso/Main.cpp
|
||
|
|
--- traverso-0.42.0/src/traverso/Main.cpp 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/traverso/Main.cpp 2008-08-26 17:05:07.000000000 +0200
|
||
|
|
@@ -31,6 +31,7 @@
|
||
|
|
// Always put me below _all_ includes, this is needed
|
||
|
|
// in case we run with memory leak detection enabled!
|
||
|
|
#include "Debugger.h"
|
||
|
|
+#include <cstdlib>
|
||
|
|
|
||
|
|
|
||
|
|
Traverso* traverso;
|
||
|
|
diff -Nru traverso-0.42.0/src/traverso/songcanvas/TimeLineView.cpp traverso-0.42.0-gil/src/traverso/songcanvas/TimeLineView.cpp
|
||
|
|
--- traverso-0.42.0/src/traverso/songcanvas/TimeLineView.cpp 2007-12-10 13:51:50.000000000 +0100
|
||
|
|
+++ traverso-0.42.0-gil/src/traverso/songcanvas/TimeLineView.cpp 2008-08-26 17:04:43.000000000 +0200
|
||
|
|
@@ -48,6 +48,7 @@
|
||
|
|
// Always put me below _all_ includes, this is needed
|
||
|
|
// in case we run with memory leak detection enabled!
|
||
|
|
#include "Debugger.h"
|
||
|
|
+#include <cstdlib>
|
||
|
|
|
||
|
|
|
||
|
|
#define MARKER_SOFT_SELECTION_DISTANCE 50
|