[Traverso-commit] traverso/src core/Song.cpp core/Utils.cpp engin...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/26 21:19:39

Modified files:
        src/core       : Song.cpp Utils.cpp 
        src/engine     : AudioDevice.cpp defines.h 

Log message:
        * and some more TimeRef related cleanups, the last for today! (at least 
from me :P )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Utils.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/defines.h?cvsroot=traverso&r1=1.22&r2=1.23

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- core/Song.cpp       26 Sep 2007 21:08:46 -0000      1.141
+++ core/Song.cpp       26 Sep 2007 21:19:39 -0000      1.142
@@ -165,7 +165,7 @@
        m_seeking = m_startSeek = 0;
        // TODO seek to old position on project exit ?
 //     m_transportFrame = 0;
-       m_transportLocation.set_position(0, audiodevice().get_sample_rate());
+       m_transportLocation = 0;
        m_mode = EDIT;
        m_sbx = m_sby = 0;
        m_currentSampleRate = audiodevice().get_sample_rate();
@@ -352,7 +352,6 @@
        spec->endLocation = 0;
 
        TimeRef endlocation, startlocation;
-       int devicerate = audiodevice().get_sample_rate();
 
        foreach (Track* track, m_tracks) {
                track->get_render_range(startlocation, endlocation);

Index: core/Utils.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Utils.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Utils.cpp      26 Sep 2007 20:46:33 -0000      1.19
+++ core/Utils.cpp      26 Sep 2007 21:19:39 -0000      1.20
@@ -110,8 +110,8 @@
 
        qint64 universalframe = ref.universal_frame();
        
-       hours = (int) (universalframe / (3600 * UNIVERSAL_SAMPLE_RATE));
-       remainder = (long unsigned int) (universalframe - (hours * 3600 * 
UNIVERSAL_SAMPLE_RATE));
+       hours = (int) (universalframe / ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
+       remainder = (long unsigned int) (universalframe - (hours * 
ONE_HOUR_UNIVERSAL_SAMPLE_RATE));
        mins = (int) (remainder / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE ));
        remainder -= mins * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE;
        secs = (int) (remainder / UNIVERSAL_SAMPLE_RATE);

Index: engine/AudioDevice.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- engine/AudioDevice.cpp      19 Jul 2007 12:28:42 -0000      1.37
+++ engine/AudioDevice.cpp      26 Sep 2007 21:19:39 -0000      1.38
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: AudioDevice.cpp,v 1.37 2007/07/19 12:28:42 r_sijrier Exp $
+$Id: AudioDevice.cpp,v 1.38 2007/09/26 21:19:39 r_sijrier Exp $
 */
 
 #include "AudioDevice.h"
@@ -790,7 +790,7 @@
        state.tranport = TransportRolling;
        state.isSlave = false;
        state.realtime = false;
-       state.location.set_position(0, get_sample_rate()); // get from client!!
+       state.location = 0; // get from client!!
        
        client->transport_control(state);
 }
@@ -810,7 +810,7 @@
        state.tranport = TransportStopped;
        state.isSlave = false;
        state.realtime = false;
-       state.location.set_position(0, get_sample_rate()); // get from client!!
+       state.location = 0; // get from client!!
        
        client->transport_control(state);
 }

Index: engine/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/defines.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- engine/defines.h    24 Sep 2007 17:39:06 -0000      1.22
+++ engine/defines.h    26 Sep 2007 21:19:39 -0000      1.23
@@ -65,10 +65,6 @@
                m_position = (UNIVERSAL_SAMPLE_RATE / rate) * frame;
        }
        
-       void set_position(nframes_t frame, int rate) {
-               m_position = (UNIVERSAL_SAMPLE_RATE / rate) * frame;
-       }
-       
        void add_frames(nframes_t frames, int rate) {
                m_position += ((UNIVERSAL_SAMPLE_RATE / rate) * frames);
        }