comparison main/PreferencesDialog.cpp @ 1413:a89ca5ccb958 3.0-integration

Reopen the audio device directly when preference is changed

 PreferencesDialog::PreferencesDialog(QWidget *parent) :
     QDialog(parent),
     m_audioImplementation(0),
     m_audioPlaybackDevice(0),
     m_audioRecordDevice(0),
+    m_audioDeviceChanged(false),
     m_changesOnRestart(false)
 {
     setWindowTitle(tr("Sonic Visualiser: Application Preferences"));
 
     Preferences *prefs = Preferences::getInstance();

         }
     }
     settings.endGroup();
 
     rebuildDeviceCombos();
-    m_changesOnRestart = false; // the rebuild will have changed this
+    m_audioDeviceChanged = false; // the rebuild will have changed this
 
     QCheckBox *resampleOnLoad = new QCheckBox;
     m_resampleOnLoad = prefs->getResampleOnLoad();
     resampleOnLoad->setCheckState(m_resampleOnLoad ? Qt::Checked :
                                   Qt::Unchecked);

 {
     if (m_audioImplementation != s) {
         m_audioImplementation = s;
         rebuildDeviceCombos();
         m_applyButton->setEnabled(true);
-        m_changesOnRestart = true;
+        m_audioDeviceChanged = true;
     }
 }
 
 void
 PreferencesDialog::audioPlaybackDeviceChanged(int s)
 {
     if (m_audioPlaybackDevice != s) {
         m_audioPlaybackDevice = s;
         m_applyButton->setEnabled(true);
-        m_changesOnRestart = true;
+        m_audioDeviceChanged = true;
     }
 }
 
 void
 PreferencesDialog::audioRecordDeviceChanged(int s)
 {
     if (m_audioRecordDevice != s) {
         m_audioRecordDevice = s;
         m_applyButton->setEnabled(true);
-        m_changesOnRestart = true;
+        m_audioDeviceChanged = true;
     }
 }
 
 void
 PreferencesDialog::resampleOnLoadChanged(int state)

     if (m_changesOnRestart) {
         QMessageBox::information(this, tr("Preferences"),
                                  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;
     }
+
+    if (m_audioDeviceChanged) {
+        emit audioDeviceChanged();
+    }
 }    
 
 void
 PreferencesDialog::cancelClicked()
 {