[Traverso-commit] traverso/src/core AudioClip.cpp AudioClip.h

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/08/15 20:15:49

Modified files:
        src/core       : AudioClip.cpp AudioClip.h 

Log message:
        more consistent use of variable m_isReadSourceValid

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.57&r2=1.58

Patches:
Index: AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- AudioClip.cpp       15 Aug 2007 20:07:41 -0000      1.121
+++ AudioClip.cpp       15 Aug 2007 20:15:48 -0000      1.122
@@ -399,7 +399,7 @@
                return 0;
        }
 
-       if (m_isReadSourceValid) {
+       if (!m_isReadSourceValid) {
                return -1;
        }
 
@@ -633,14 +633,14 @@
        PENTER;
        
        if (!rs) {
-               m_isReadSourceValid = true;
+               m_isReadSourceValid = false;
                return;
        }
        
        if (rs->get_error() < 0) {
-               m_isReadSourceValid = true;
-       } else {
                m_isReadSourceValid = false;
+       } else {
+               m_isReadSourceValid = true;
        }
                
        m_readSource = rs;
@@ -742,7 +742,7 @@
 void AudioClip::set_song( Song * song )
 {
        m_song = song;
-       if (m_readSource && !m_isReadSourceValid) {
+       if (m_readSource && m_isReadSourceValid) {
                m_song->get_diskio()->register_read_source( m_readSource );
        } else {
                PWARN("AudioClip::set_song() : Setting Song, but no ReadSource 
available!!");

Index: AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- AudioClip.h 15 Aug 2007 20:07:41 -0000      1.57
+++ AudioClip.h 15 Aug 2007 20:15:49 -0000      1.58
@@ -112,7 +112,7 @@
        bool is_selected() const;
        bool is_locked() const;
        bool has_song() const;
-       bool invalid_readsource() const {return m_isReadSourceValid;}
+       bool is_readsource_invalid() const {return !m_isReadSourceValid;}
        int recording_state() const;
 
        static bool smaller(const AudioClip* left, const AudioClip* right )