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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/24 11:07:45

Modified files:
        src/core       : Song.cpp 

Log message:
        * fix progress calculation when spec->startlocation != 0

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.158&r2=1.159

Patches:
Index: Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- Song.cpp    23 Nov 2007 14:21:08 -0000      1.158
+++ Song.cpp    24 Nov 2007 11:07:45 -0000      1.159
@@ -539,9 +539,9 @@
        spec->pos.add_frames(nframes, audiodevice().get_sample_rate());
 
        if (! spec->normalize ) {
-               progress =  int((double(spec->pos.universal_frame()) / 
spec->totalTime.universal_frame()) * 100);
+               progress =  int((double((spec->pos - 
spec->startLocation).universal_frame()) / spec->totalTime.universal_frame()) * 
100);
        } else {
-               progress = (int) (double( 100 * spec->pos.universal_frame()) / 
(spec->totalTime.universal_frame() * 2));
+               progress = (int) (double( 100 * (spec->pos - 
spec->startLocation).universal_frame()) / (spec->totalTime.universal_frame() * 
2));
                if (spec->renderpass == ExportSpecification::WRITE_TO_HARDDISK) 
{
                        progress += 50;
                }