[Traverso-commit] traverso CMakeLists.txt src/3rdparty/slv2/slv2/...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/03/14 22:04:58

Modified files:
        .              : CMakeLists.txt 
        src/3rdparty/slv2/slv2: plugininstance.h 
        src/core       : Sheet.cpp 
        src/sheetcanvas: AudioClipView.cpp 

Log message:
        * disable slv2.h header check, cmake doesn't find it even if it's there 
...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/3rdparty/slv2/slv2/plugininstance.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.24&r2=1.25

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- CMakeLists.txt      13 Mar 2009 23:08:26 -0000      1.36
+++ CMakeLists.txt      14 Mar 2009 22:04:57 -0000      1.37
@@ -193,10 +193,10 @@
 
 IF(WANT_LV2)
        IF(USE_SYSTEM_SLV2_LIBRARY)
-               CHECK_INCLUDE_FILE("slv2/slv2.h" HAVE_SLV2_H)
-               IF(NOT HAVE_SLV2_H)
-                       MESSAGE(FATAL_ERROR "lv2 support requested, but slv2 
development headers could not be found!\nPlease install the slv2 development 
package (Usually called libslv2-dev), remove CMakeCache.txt and run cmake 
again")
-               ENDIF(NOT HAVE_SLV2_H)
+#              CHECK_INCLUDE_FILE("slv2/slv2.h" HAVE_SLV2_H)
+#              IF(NOT HAVE_SLV2_H)
+#                      MESSAGE(FATAL_ERROR "lv2 support requested, but slv2 
development headers could not be found!\nPlease install the slv2 development 
package (Usually called libslv2-dev), remove CMakeCache.txt and run cmake 
again")
+#              ENDIF(NOT HAVE_SLV2_H)
                
                PKG_CHECK_MODULES(SLV2  libslv2>=${MINIMAL_SLV2_VERSION})
                IF (SLV2_FOUND)

Index: src/3rdparty/slv2/slv2/plugininstance.h
===================================================================
RCS file: /sources/traverso/traverso/src/3rdparty/slv2/slv2/plugininstance.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: src/core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/core/Sheet.cpp  7 Mar 2009 18:08:31 -0000       1.23
+++ src/core/Sheet.cpp  14 Mar 2009 22:04:58 -0000      1.24
@@ -876,8 +876,8 @@
        QList<Marker*> mlist = m_timeline->get_markers();
        QList<Marker*> tempmarkers;
 
-       //Â Here we make the marker-stuff idiot-proof ;-). Traverso doesn't 
insist on having any
-       //Â marker at all, so we need to handle cases like:
+       // Here we make the marker-stuff idiot-proof ;-). Traverso doesn't 
insist on having any
+       // marker at all, so we need to handle cases like:
        // - no markers at all
        // - one marker (doesn't make sense)
        // - enough markers, but no end marker
@@ -903,7 +903,7 @@
                                // it will now be overwritten, so we will never 
end up with
                                // two markers at the same position.
 
-                               //Â deactivate the next if-condition (only the 
first one) if you want the
+                               // deactivate the next if-condition (only the 
first one) if you want the
                                // stuff before the first marker to go into the 
pre-gap
                                if (mlist.at(0)->get_when() != 
(spec->startLocation)) {
                                        temp = new Marker(m_timeline, 
spec->startLocation, Marker::CDTRACK);
@@ -954,14 +954,14 @@
                output += "      SONGWRITER \"" + startmarker->get_songwriter() 
+ "\"\n";
                output += "      MESSAGE \"" + startmarker->get_message() + 
"\"\n    }\n  }\n";
 
-               //Â add some stuff only required for the first track (e.g. 
pre-gap)
+               // add some stuff only required for the first track (e.g. 
pre-gap)
                if ((i == 0) && pregap) {
                        //if (start == 0) {
                                // standard pregap, because we have a track 
marker at the beginning
                                output += "  PREGAP 00:02:00\n";
                        //} else {
                        //      // no track marker at the beginning, thus use 
the part from 0 to the first
-                       //      //Â track marker for the pregap
+                       //      // track marker for the pregap
                        //      output += "  START " + frame_to_cd(start, 
m_project->get_rate()) + "\n";
                        //      start = 0;
                        //}
@@ -981,7 +981,7 @@
                }
        }
 
-       //Â delete all temporary markers
+       // delete all temporary markers
        foreach(Marker* marker, tempmarkers) {
                delete marker;
        }

Index: src/sheetcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/sheetcanvas/AudioClipView.cpp   6 Mar 2009 11:08:32 -0000       1.24
+++ src/sheetcanvas/AudioClipView.cpp   14 Mar 2009 22:04:58 -0000      1.25
@@ -541,7 +541,7 @@
                channels = 1;
        }
 
-       //Â calculate the height of one channel
+       // calculate the height of one channel
        if (m_height >= m_mimimumheightforinfoarea) {
                p->setMatrix(matrix().translate(0, m_infoAreaHeight), true);
                height = (m_height - m_infoAreaHeight) / channels;
@@ -561,7 +561,7 @@
                int zeroDb = 0.9 * height / 2;
                int msixDb = 0.9 * height / 4;
 
-               //Â draw the lines above and below the center line, then 
translate
+               // draw the lines above and below the center line, then 
translate
                // the painter to the next channel
                for (int i = 0; i < channels; ++i) {
                        p->drawLine(linestartpos, zeroDb, xstart+pixelcount, 
zeroDb);
@@ -588,7 +588,7 @@
                int zeroDb = 0.95 * height;
                int msixDb = 0.95 * height / 2;
 
-               //Â draw the lines above the center line, then translate
+               // draw the lines above the center line, then translate
                // the painter to the next channel
                for (int i = 0; i < channels; ++i) {
                        p->drawLine(linestartpos, -zeroDb, xstart+pixelcount, 
-zeroDb);