[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src common/Utils.cpp traverso/widgets/...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src common/Utils.cpp traverso/widgets/... |
Date: |
Fri, 30 Nov 2007 19:58:09 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/30 19:58:08
Modified files:
src/common : Utils.cpp
src/traverso/widgets: InfoWidgets.cpp
Log message:
* use the correct type to avoid overflowing the remainder variable in
Utils::timeref_to_hms()
* use double in calculating the recording time left, since it is a
valid type to be used for TimeRef
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Utils.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.50&r2=1.51
Patches:
Index: common/Utils.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/common/Utils.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- common/Utils.cpp 30 Nov 2007 19:38:20 -0000 1.6
+++ common/Utils.cpp 30 Nov 2007 19:58:08 -0000 1.7
@@ -112,7 +112,7 @@
qint64 universalframe = ref.universal_frame();
hours = (int) (universalframe / ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
- remainder = (long unsigned int) (universalframe - (hours *
ONE_HOUR_UNIVERSAL_SAMPLE_RATE));
+ remainder = qint64(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: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- traverso/widgets/InfoWidgets.cpp 27 Nov 2007 13:35:32 -0000 1.50
+++ traverso/widgets/InfoWidgets.cpp 30 Nov 2007 19:58:08 -0000 1.51
@@ -339,8 +339,8 @@
}
uint rate = audiodevice().get_sample_rate();
- qint64 availabletime = qint64(UNIVERSAL_SAMPLE_RATE / rate) *
qint64(space * 1048576);
- availabletime /= qint64(sizeof(float) * recChannelCount);
+ double availabletime = (double(UNIVERSAL_SAMPLE_RATE) / rate) *
space * 1048576.0;
+ availabletime /= double(sizeof(float) * recChannelCount);
QString recordFormat = config().get_property("Recording",
"FileFormat", "wav").toString();
// I think a compression ratio of 40 % with wavpack is a safe
estimation
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src common/Utils.cpp traverso/widgets/...,
Remon Sijrier <=