diff main/PreferencesDialog.cpp @ 1150:5e6e1e074080 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf

--- a/main/PreferencesDialog.cpp	Fri Apr 15 16:26:15 2016 +0100
+++ b/main/PreferencesDialog.cpp	Wed Apr 20 12:06:28 2016 +0100
@@ -5,7 +5,7 @@
     An audio file viewer and annotation editor.
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Chris Cannam.
-    
+
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
@@ -60,7 +60,7 @@
 
     m_tabs = new QTabWidget;
     grid->addWidget(m_tabs, 0, 0);
-    
+
     m_tabs->setTabPosition(QTabWidget::North);
 
     // Create this first, as slots that get called from the ctor will
@@ -81,7 +81,7 @@
             this, SLOT(windowTypeChanged(WindowType)));
 
     QComboBox *smoothing = new QComboBox;
-    
+
     int sm = prefs->getPropertyRangeAndValue("Spectrogram Y Smoothing", &min, &max,
                                              &deflt);
     m_spectrogramSmoothing = sm;
@@ -96,7 +96,7 @@
             this, SLOT(spectrogramSmoothingChanged(int)));
 
     QComboBox *xsmoothing = new QComboBox;
-    
+
     int xsm = prefs->getPropertyRangeAndValue("Spectrogram X Smoothing", &min, &max,
                                              &deflt);
     m_spectrogramXSmoothing = xsm;
@@ -181,7 +181,8 @@
     QComboBox *audioDevice = new QComboBox;
     std::vector<QString> devices =
         AudioTargetFactory::getInstance()->getCallbackTargetNames();
-    
+
+    QSettings settings;
     settings.beginGroup("Preferences");
     QString targetName = settings.value("audio-target", "").toString();
     settings.endGroup();
@@ -339,7 +340,7 @@
     // General tab
 
     QFrame *frame = new QFrame;
-    
+
     QGridLayout *subgrid = new QGridLayout;
     frame->setLayout(subgrid);
 
@@ -374,7 +375,7 @@
     subgrid->addWidget(resampleQuality, row++, 1, 1, 2);
 
     subgrid->setRowStretch(row, 10);
-    
+
     m_tabOrdering[GeneralTab] = m_tabs->count();
     m_tabs->addTab(frame, tr("&General"));
 
@@ -437,7 +438,7 @@
     subgrid->addWidget(hms, row++, 1, 1, 1);
 
     subgrid->setRowStretch(row, 10);
-    
+
     m_tabOrdering[AppearanceTab] = m_tabs->count();
     m_tabs->addTab(frame, tr("&Appearance"));
 
@@ -474,9 +475,9 @@
     subgrid->addWidget(m_windowTypeSelector, row++, 1, 2, 2);
     subgrid->setRowStretch(row, 10);
     row++;
-    
+
     subgrid->setRowStretch(row, 10);
-    
+
     m_tabOrdering[AnalysisTab] = m_tabs->count();
     m_tabs->addTab(frame, tr("Anal&ysis"));
 
@@ -486,7 +487,7 @@
     subgrid = new QGridLayout;
     frame->setLayout(subgrid);
     row = 0;
-    
+
     subgrid->addWidget(new QLabel(tr("Default session template for audio files:")), row++, 0);
 
     QListWidget *lw = new QListWidget();
@@ -527,7 +528,7 @@
 
     QDialogButtonBox *bb = new QDialogButtonBox(Qt::Horizontal);
     grid->addWidget(bb, 1, 0);
-    
+
     QPushButton *ok = new QPushButton(tr("OK"));
     QPushButton *cancel = new QPushButton(tr("Cancel"));
     bb->addButton(ok, QDialogButtonBox::AcceptRole);
@@ -784,7 +785,7 @@
                                  tr("<b>Restart required</b><p>One or more of the application preferences you have changed may not take full effect until Sonic Visualiser is restarted.</p><p>Please exit and restart the application now if you want these changes to take effect immediately.</p>"));
         m_changesOnRestart = false;
     }
-}    
+}
 
 void
 PreferencesDialog::cancelClicked()