[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src common/defines.h core/DiskIO.cpp c...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src common/defines.h core/DiskIO.cpp c... |
Date: |
Wed, 23 Jan 2008 17:32:23 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/23 17:32:23
Modified files:
src/common : defines.h
src/core : DiskIO.cpp ReadSource.cpp Sheet.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso : Interface.cpp
Log message:
* move default resample quality to defines.h as a define (usefull for
others as well!!)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/defines.h?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/DiskIO.cpp?cvsroot=traverso&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.123&r2=1.124
Patches:
Index: common/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/defines.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- common/defines.h 2 Jan 2008 19:23:59 -0000 1.5
+++ common/defines.h 23 Jan 2008 17:32:22 -0000 1.6
@@ -473,6 +473,8 @@
#define PROFILE_START trav_time_t starttime = get_microseconds();
#define PROFILE_END(args...) int processtime = (int) (get_microseconds() -
starttime);printf("Process time for %s: %d useconds\n\n", args, processtime);
+#define DEFAULT_RESAMPLE_QUALITY 2
+
#endif // endif TRAVERSO_TYPES_H
//eof
Index: core/DiskIO.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/DiskIO.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- core/DiskIO.cpp 21 Jan 2008 16:22:13 -0000 1.57
+++ core/DiskIO.cpp 23 Jan 2008 17:32:23 -0000 1.58
@@ -146,7 +146,7 @@
cpuTimeBuffer = new RingBuffer(128);
lastCpuReadTime = get_microseconds();
m_stopWork = m_seeking = m_sampleRateChanged = 0;
- m_resampleQuality = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ m_resampleQuality = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
m_readBufferFillStatus = 0;
m_hardDiskOverLoadCounter = 0;
@@ -196,7 +196,7 @@
TimeRef location = m_sheet->get_new_transport_location();
bool resampleQualityChanged = false;
- int quality = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ int quality = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
if (quality != m_resampleQuality) {
resampleQualityChanged = true;
m_resampleQuality = quality;
Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- core/ReadSource.cpp 21 Jan 2008 16:22:14 -0000 1.91
+++ core/ReadSource.cpp 23 Jan 2008 17:32:23 -0000 1.92
@@ -236,7 +236,7 @@
return (m_error = COULD_NOT_OPEN_FILE);
}
- int converter_type = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ int converter_type = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
m_audioReader->set_converter_type(converter_type);
set_output_rate(m_audioReader->get_file_rate());
Index: core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- core/Sheet.cpp 21 Jan 2008 16:22:48 -0000 1.1
+++ core/Sheet.cpp 23 Jan 2008 17:32:23 -0000 1.2
@@ -1403,7 +1403,7 @@
{
PENTER;
- int quality = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ int quality = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
if (m_diskio->get_resample_quality() != quality) {
TimeRef location = m_transportLocation;
location.add_frames(1, audiodevice().get_sample_rate());
Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- traverso/dialogs/settings/Pages.cpp 21 Jan 2008 16:25:17 -0000 1.35
+++ traverso/dialogs/settings/Pages.cpp 23 Jan 2008 17:32:23 -0000 1.36
@@ -958,7 +958,7 @@
m_config->wavpackCompressionComboBox->setCurrentIndex(2);
}
- int index = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ int index = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
m_config->ontheflyResampleComboBox->setCurrentIndex(index);
index = config().get_property("Conversion",
"ExportResamplingConverterType", 1).toInt();
@@ -979,7 +979,7 @@
void RecordingPage::reset_default_config()
{
config().set_property("Conversion", "DynamicResampling", true);
- config().set_property("Conversion", "RTResamplingConverterType", 2);
+ config().set_property("Conversion", "RTResamplingConverterType",
DEFAULT_RESAMPLE_QUALITY);
config().set_property("Conversion", "ExportResamplingConverterType", 1);
config().set_property("Recording", "FileFormat", "wav");
config().set_property("Recording", "WavpackCompressionType", "fast");
Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- traverso/Interface.cpp 21 Jan 2008 16:22:17 -0000 1.123
+++ traverso/Interface.cpp 23 Jan 2008 17:32:23 -0000 1.124
@@ -1016,7 +1016,7 @@
widget->set_use_opengl(toggled);
}
- QString encoding = config().get_property("Recording", "FileFormat",
"").toString();
+ QString encoding = config().get_property("Recording", "FileFormat",
"wav").toString();
QList<QAction* > actions = m_encodingMenu->actions();
foreach(QAction* action, actions) {
@@ -1027,7 +1027,7 @@
}
}
- int quality = config().get_property("Conversion",
"RTResamplingConverterType", 2).toInt();
+ int quality = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
actions = m_resampleQualityMenu->actions();
foreach(QAction* action, actions) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src common/defines.h core/DiskIO.cpp c...,
Remon Sijrier <=