[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.cp... |
Date: |
Thu, 24 Jan 2008 20:36:08 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/24 20:36:07
Modified files:
src/traverso/dialogs/settings: Pages.cpp
src/traverso : Interface.cpp
Log message:
* Pages: do not crash if for some weird reason the buffersize combobox
didn't contain any items. (it happened, can't reproduce though)
* disable resample menu in Interface main menu->Settings if resampling
was disabled
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.124&r2=1.125
Patches:
Index: dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- dialogs/settings/Pages.cpp 24 Jan 2008 18:06:26 -0000 1.38
+++ dialogs/settings/Pages.cpp 24 Jan 2008 20:36:07 -0000 1.39
@@ -114,8 +114,12 @@
void AudioDriverPage::save_config()
{
config().set_property("Hardware", "samplerate",
m_driverConfigPage->rateComboBox->currentText());
- config().set_property("Hardware", "buffersize",
-
m_driverConfigPage->periodBufferSizesList.at(m_driverConfigPage->latencyComboBox->currentIndex()));
+ int bufferindex = m_driverConfigPage->latencyComboBox->currentIndex();
+ int buffersize = 1024;
+ if (bufferindex >= 0) {
+ buffersize =
m_driverConfigPage->periodBufferSizesList.at(bufferindex);
+ }
+ config().set_property("Hardware", "buffersize", buffersize);
config().set_property("Hardware", "drivertype",
m_driverCombo->currentText());
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- Interface.cpp 23 Jan 2008 17:32:23 -0000 1.124
+++ Interface.cpp 24 Jan 2008 20:36:07 -0000 1.125
@@ -1030,6 +1030,14 @@
int quality = config().get_property("Conversion",
"RTResamplingConverterType", DEFAULT_RESAMPLE_QUALITY).toInt();
actions = m_resampleQualityMenu->actions();
+ bool useResampling = config().get_property("Conversion",
"DynamicResampling", true).toBool();
+ if (useResampling) {
+ m_resampleQualityMenu->setEnabled(true);
+ } else {
+ m_resampleQualityMenu->setEnabled(false);
+ }
+
+
foreach(QAction* action, actions) {
if (action->data().toInt() == quality) {
action->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));