[Traverso-commit] traverso/src commands/AudioClipExternalProcessi...

[Remon Sijrier]

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

Modified files:
        src/commands   : AudioClipExternalProcessing.cpp 
        src/core       : AudioClip.cpp Song.cpp 

Log message:
        * micro cleanup

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.140&r2=1.141

Patches:
Index: commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- commands/AudioClipExternalProcessing.cpp    26 Sep 2007 20:46:32 -0000      
1.30
+++ commands/AudioClipExternalProcessing.cpp    26 Sep 2007 21:08:46 -0000      
1.31
@@ -58,7 +58,7 @@
        
                ExportSpecification* spec = new ExportSpecification();
                spec->startLocation = 0;
-               spec->endLocation = TimeRef(m_readsource->get_nframes(), 
m_readsource->get_rate());
+               spec->endLocation = m_readsource->get_length();
                spec->totalTime = spec->endLocation;
                spec->pos = 0;
                spec->isRecording = false;

Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- core/AudioClip.cpp  26 Sep 2007 20:46:32 -0000      1.137
+++ core/AudioClip.cpp  26 Sep 2007 21:08:46 -0000      1.138
@@ -418,7 +418,7 @@
 
 
        TimeRef transportLocation = m_song->get_transport_location();
-       TimeRef upperRange = TimeRef(transportLocation.to_frame(get_rate()) + 
nframes, get_rate());
+       TimeRef upperRange = transportLocation + TimeRef(nframes, get_rate());
        
        if ( (m_trackStartLocation < upperRange) && (m_trackEndLocation > 
transportLocation) ) {
                if (transportLocation < m_trackStartLocation) {

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- core/Song.cpp       26 Sep 2007 20:46:33 -0000      1.140
+++ core/Song.cpp       26 Sep 2007 21:08:46 -0000      1.141
@@ -377,7 +377,7 @@
                QList<Marker*> markers = m_timeline->get_markers();
                if (markers.size() >= 2) {
                        startlocation = markers.at(0)->get_when();
-                       PMESG2("  Start marker found at %d", 
startlocation.to_frame(devicerate));
+                       PMESG2("  Start marker found at %s", 
QS_C(timeref_to_ms(startlocation)));
                        // round down to the start of the CD frome (75th of a 
sec)
                        startlocation = 
cd_to_timeref(timeref_to_cd(startlocation));
                        spec->startLocation = startlocation;
@@ -386,7 +386,7 @@
                }
                
                if (m_timeline->get_end_position(endlocation)) {
-                       PMESG2("  End marker found at %d", 
endlocation.to_frame(devicerate));
+                       PMESG2("  End marker found at %s", 
QS_C(timeref_to_ms(endlocation)));
                        spec->endLocation = endlocation;
                } else {
                        PMESG2("  No end marker found");