[Traverso-commit] traverso/src core/ReadSource.cpp core/ReadSourc...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/12/17 21:17:08

Modified files:
        src/core       : ReadSource.cpp ReadSource.h 
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        * fixed compiler errors when compiled with g++ 4.3

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.h?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.56&r2=1.57

Patches:
Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- core/ReadSource.cpp 3 Dec 2007 21:15:57 -0000       1.87
+++ core/ReadSource.cpp 17 Dec 2007 21:17:07 -0000      1.88
@@ -328,7 +328,7 @@
        m_clip = clip;
 }
 
-const nframes_t ReadSource::get_nframes( ) const
+nframes_t ReadSource::get_nframes( ) const
 {
        if (!m_audioReader) {
                return 0;

Index: core/ReadSource.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- core/ReadSource.h   29 Nov 2007 13:17:30 -0000      1.44
+++ core/ReadSource.h   17 Dec 2007 21:17:08 -0000      1.45
@@ -68,7 +68,7 @@
        
        void set_audio_clip(AudioClip* clip);
        void set_diskio(DiskIO* diskio);
-       const nframes_t get_nframes() const;
+       nframes_t get_nframes() const;
        int get_file_rate() const;
        int get_output_rate() const {return m_outputRate;}
        const TimeRef& get_length() const {return m_length;}

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- traverso/songcanvas/TimeLineView.cpp        23 Nov 2007 14:21:08 -0000      
1.56
+++ traverso/songcanvas/TimeLineView.cpp        17 Dec 2007 21:17:08 -0000      
1.57
@@ -129,7 +129,7 @@
 {
        if (d->bypassjog) {
                int diff = d->jogBypassPos - cpointer().x();
-               if (std::abs(diff) > 15) {
+               if (abs(diff) > 15) {
                        d->bypassjog = false;
                } else {
                        return 0;