Mercurial > hg > sonic-visualiser
comparison main/PreferencesDialog.cpp @ 1040:1f4e40be5aa2 3.0-integration
Merge from branch bqaudioio
author | Chris Cannam |
---|---|
date | Tue, 04 Aug 2015 16:39:40 +0100 |
parents | c9d87032f3da 28ccb621d1af |
children | 52570633e6ff |
comparison
equal
deleted
inserted
replaced
1039:e517197049bc | 1040:1f4e40be5aa2 |
---|---|
37 #include <set> | 37 #include <set> |
38 | 38 |
39 #include "widgets/WindowTypeSelector.h" | 39 #include "widgets/WindowTypeSelector.h" |
40 #include "widgets/IconLoader.h" | 40 #include "widgets/IconLoader.h" |
41 #include "base/Preferences.h" | 41 #include "base/Preferences.h" |
42 #include "audioio/AudioTargetFactory.h" | |
43 #include "base/ResourceFinder.h" | 42 #include "base/ResourceFinder.h" |
43 | |
44 //#include "audioio/AudioTargetFactory.h" | |
44 | 45 |
45 #include "version.h" | 46 #include "version.h" |
46 | 47 |
47 PreferencesDialog::PreferencesDialog(QWidget *parent) : | 48 PreferencesDialog::PreferencesDialog(QWidget *parent) : |
48 QDialog(parent), | 49 QDialog(parent), |
147 octaveSystem->setCurrentIndex(oct); | 148 octaveSystem->setCurrentIndex(oct); |
148 | 149 |
149 connect(octaveSystem, SIGNAL(currentIndexChanged(int)), | 150 connect(octaveSystem, SIGNAL(currentIndexChanged(int)), |
150 this, SLOT(octaveSystemChanged(int))); | 151 this, SLOT(octaveSystemChanged(int))); |
151 | 152 |
153 QSettings settings; | |
154 | |
155 /*!!! restore | |
152 QComboBox *audioDevice = new QComboBox; | 156 QComboBox *audioDevice = new QComboBox; |
153 std::vector<QString> devices = | 157 std::vector<QString> devices = |
154 AudioTargetFactory::getInstance()->getCallbackTargetNames(); | 158 AudioTargetFactory::getInstance()->getCallbackTargetNames(); |
155 | 159 |
156 QSettings settings; | |
157 settings.beginGroup("Preferences"); | 160 settings.beginGroup("Preferences"); |
158 QString targetName = settings.value("audio-target", "").toString(); | 161 QString targetName = settings.value("audio-target", "").toString(); |
159 settings.endGroup(); | 162 settings.endGroup(); |
160 | 163 |
161 for (int i = 0; i < (int)devices.size(); ++i) { | 164 for (int i = 0; i < (int)devices.size(); ++i) { |
164 if (targetName == devices[i]) audioDevice->setCurrentIndex(i); | 167 if (targetName == devices[i]) audioDevice->setCurrentIndex(i); |
165 } | 168 } |
166 | 169 |
167 connect(audioDevice, SIGNAL(currentIndexChanged(int)), | 170 connect(audioDevice, SIGNAL(currentIndexChanged(int)), |
168 this, SLOT(audioDeviceChanged(int))); | 171 this, SLOT(audioDeviceChanged(int))); |
169 | 172 */ |
170 QComboBox *resampleQuality = new QComboBox; | 173 QComboBox *resampleQuality = new QComboBox; |
171 | 174 |
172 int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max, | 175 int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max, |
173 &deflt); | 176 &deflt); |
174 m_resampleQuality = rsq; | 177 m_resampleQuality = rsq; |
335 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel | 338 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel |
336 ("Resample On Load"))), | 339 ("Resample On Load"))), |
337 row, 0); | 340 row, 0); |
338 subgrid->addWidget(resampleOnLoad, row++, 1, 1, 1); | 341 subgrid->addWidget(resampleOnLoad, row++, 1, 1, 1); |
339 | 342 |
340 subgrid->addWidget(new QLabel(tr("Playback audio device:")), row, 0); | 343 //!!! subgrid->addWidget(new QLabel(tr("Playback audio device:")), row, 0); |
341 subgrid->addWidget(audioDevice, row++, 1, 1, 2); | 344 //!!! subgrid->addWidget(audioDevice, row++, 1, 1, 2); |
342 | 345 |
343 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel | 346 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel |
344 ("Resample Quality"))), | 347 ("Resample Quality"))), |
345 row, 0); | 348 row, 0); |
346 subgrid->addWidget(resampleQuality, row++, 1, 1, 2); | 349 subgrid->addWidget(resampleQuality, row++, 1, 1, 2); |
693 prefs->setShowHMS(m_showHMS); | 696 prefs->setShowHMS(m_showHMS); |
694 prefs->setViewFontSize(m_viewFontSize); | 697 prefs->setViewFontSize(m_viewFontSize); |
695 | 698 |
696 prefs->setProperty("Octave Numbering System", m_octaveSystem); | 699 prefs->setProperty("Octave Numbering System", m_octaveSystem); |
697 | 700 |
698 std::vector<QString> devices = | 701 //!!! std::vector<QString> devices = |
699 AudioTargetFactory::getInstance()->getCallbackTargetNames(); | 702 //!!! AudioTargetFactory::getInstance()->getCallbackTargetNames(); |
700 | 703 |
701 QSettings settings; | 704 QSettings settings; |
702 settings.beginGroup("Preferences"); | 705 settings.beginGroup("Preferences"); |
703 QString permishTag = QString("network-permission-%1").arg(SV_VERSION); | 706 QString permishTag = QString("network-permission-%1").arg(SV_VERSION); |
704 settings.setValue(permishTag, m_networkPermission); | 707 settings.setValue(permishTag, m_networkPermission); |
705 settings.setValue("audio-target", devices[m_audioDevice]); | 708 //!!! settings.setValue("audio-target", devices[m_audioDevice]); |
706 settings.setValue("locale", m_currentLocale); | 709 settings.setValue("locale", m_currentLocale); |
707 #ifdef Q_OS_MAC | 710 #ifdef Q_OS_MAC |
708 settings.setValue("scaledHiDpi", m_retina); | 711 settings.setValue("scaledHiDpi", m_retina); |
709 #endif | 712 #endif |
710 settings.endGroup(); | 713 settings.endGroup(); |