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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/11 14:16:03

Modified files:
        src/core       : Peak.cpp ReadSource.cpp Utils.cpp 
        src/engine     : defines.h 
        src/traverso/dialogs: AudioClipEditDialog.cpp 
        src/traverso/widgets: ResourcesWidget.cpp 

Log message:
        fixed small bug, added universal samplerate constants

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Utils.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/defines.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/AudioClipEditDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.29&r2=1.30

Patches:
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- core/Peak.cpp       10 Sep 2007 18:42:48 -0000      1.45
+++ core/Peak.cpp       11 Sep 2007 14:16:02 -0000      1.46
@@ -549,7 +549,7 @@
 
        int p = 0;
 
-       if (m_source->get_nframes() == 0) {
+       if (m_source->get_length() == 0) {
                qWarning("Peak::create_from_scratch() : m_source (%s) has 
length 0", m_source->get_name().toAscii().data());
                return ret;
        }

Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- core/ReadSource.cpp 10 Sep 2007 21:29:45 -0000      1.56
+++ core/ReadSource.cpp 11 Sep 2007 14:16:02 -0000      1.57
@@ -311,6 +311,7 @@
 
 const nframes_t ReadSource::get_nframes( ) const
 {
+       Q_ASSERT(m_audioReader);
        return m_audioReader->get_nframes();
 }
 

Index: core/Utils.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Utils.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- core/Utils.cpp      10 Sep 2007 19:22:52 -0000      1.14
+++ core/Utils.cpp      11 Sep 2007 14:16:02 -0000      1.15
@@ -151,7 +151,7 @@
        TimeRef out = 0;
        QStringList lst = str.simplified().split(QRegExp("[;,.:]"), 
QString::SkipEmptyParts);
 
-       if (lst.size() >= 1) out += lst.at(0).toInt() * 60 * 
UNIVERSAL_SAMPLE_RATE;
+       if (lst.size() >= 1) out += lst.at(0).toInt() * 
ONE_MINUTE_UNIVERSAL_SAMPLE_RATE;
        if (lst.size() >= 2) out += lst.at(1).toInt() * UNIVERSAL_SAMPLE_RATE;
        if (lst.size() >= 3) out += lst.at(2).toInt() * UNIVERSAL_SAMPLE_RATE / 
1000;
 
@@ -225,8 +225,8 @@
 
        qint64 universalframe = ref.universal_frame();
        
-       mins = (int) (universalframe / ( 60 * UNIVERSAL_SAMPLE_RATE ));
-       remainder = (long unsigned int) (universalframe - (mins * 60 * 
UNIVERSAL_SAMPLE_RATE));
+       mins = (int) (universalframe / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE ));
+       remainder = (long unsigned int) (universalframe - (mins * 
ONE_MINUTE_UNIVERSAL_SAMPLE_RATE));
        secs = (int) (remainder / UNIVERSAL_SAMPLE_RATE);
        return QString().sprintf("%02d:%02d", mins, secs);
 }
@@ -240,8 +240,8 @@
        
        qint64 universalframe = ref.universal_frame();
 
-       mins = universalframe / ( 60 * UNIVERSAL_SAMPLE_RATE );
-       remainder = universalframe - ( mins * 60 * UNIVERSAL_SAMPLE_RATE );
+       mins = universalframe / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
+       remainder = universalframe - ( mins * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE 
);
        secs = remainder / UNIVERSAL_SAMPLE_RATE;
        remainder -= secs * UNIVERSAL_SAMPLE_RATE;
        frames = remainder * 100 / UNIVERSAL_SAMPLE_RATE;
@@ -259,8 +259,8 @@
        
        qint64 universalframe = ref.universal_frame();
 
-       mins = universalframe / ( 60 * UNIVERSAL_SAMPLE_RATE );
-       remainder = universalframe - ( mins * 60 * UNIVERSAL_SAMPLE_RATE );
+       mins = universalframe / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
+       remainder = universalframe - ( mins * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE 
);
        secs = remainder / UNIVERSAL_SAMPLE_RATE;
        remainder -= secs * UNIVERSAL_SAMPLE_RATE;
        frames = remainder * 1000 / UNIVERSAL_SAMPLE_RATE;

Index: engine/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/defines.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- engine/defines.h    10 Sep 2007 18:43:03 -0000      1.19
+++ engine/defines.h    11 Sep 2007 14:16:03 -0000      1.20
@@ -51,6 +51,8 @@
 
 // Universal samplerate for the frequences 22050, 32000, 44100, 88200, 96000 
and 192000 Hz
 static const qint64 UNIVERSAL_SAMPLE_RATE = 28224000;
+static const qint64 ONE_HOUR_UNIVERSAL_SAMPLE_RATE = 101606400000LL;
+static const qint64 ONE_MINUTE_UNIVERSAL_SAMPLE_RATE = 1693440000LL;
 
 struct TimeRef {
        

Index: traverso/dialogs/AudioClipEditDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/AudioClipEditDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/dialogs/AudioClipEditDialog.cpp    11 Sep 2007 13:01:40 -0000      
1.9
+++ traverso/dialogs/AudioClipEditDialog.cpp    11 Sep 2007 14:16:03 -0000      
1.10
@@ -420,7 +420,7 @@
 
 TimeRef AudioClipEditWidget::qtime_to_timeref(const QTime & time)
 {
-       TimeRef ref(time.hour() * 3600 * UNIVERSAL_SAMPLE_RATE + time.minute() 
* 60 * UNIVERSAL_SAMPLE_RATE + time.second() * UNIVERSAL_SAMPLE_RATE + 
(time.msec() * UNIVERSAL_SAMPLE_RATE) / 1000);
+       TimeRef ref(time.hour() * ONE_HOUR_UNIVERSAL_SAMPLE_RATE + 
time.minute() * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE + time.second() * 
UNIVERSAL_SAMPLE_RATE + (time.msec() * UNIVERSAL_SAMPLE_RATE) / 1000);
        return ref;
 }
 
@@ -431,10 +431,10 @@
 
        qint64 universalframe = ref.universal_frame();
        
-       hours = universalframe / (3600 * UNIVERSAL_SAMPLE_RATE);
-       remainder = universalframe - (hours * 3600 * UNIVERSAL_SAMPLE_RATE);
-       mins = remainder / ( 60 * UNIVERSAL_SAMPLE_RATE );
-       remainder = remainder - (mins * 60 * UNIVERSAL_SAMPLE_RATE );
+       hours = universalframe / (ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
+       remainder = universalframe - (hours * ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
+       mins = remainder / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
+       remainder = remainder - (mins * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
        secs = remainder / UNIVERSAL_SAMPLE_RATE;
        remainder -= secs * UNIVERSAL_SAMPLE_RATE;
        msec = remainder * 1000 / UNIVERSAL_SAMPLE_RATE;

Index: traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- traverso/widgets/ResourcesWidget.cpp        10 Sep 2007 18:44:17 -0000      
1.29
+++ traverso/widgets/ResourcesWidget.cpp        11 Sep 2007 14:16:03 -0000      
1.30
@@ -470,7 +470,7 @@
        
        int rate = m_source->get_rate();
        if (rate == 0) rate = pm().get_project()->get_rate();
-       QString duration = frame_to_ms(m_source->get_nframes(), rate);
+       QString duration = timeref_to_ms(m_source->get_length());
        setText(0, m_source->get_short_name());
        setText(1, duration);
        setText(2, "");