Mercurial > hg > sonic-visualiser
diff main/MainWindow.cpp @ 1429:3e2dee09c10c levelpanwidget
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Wed, 14 Dec 2016 14:28:41 +0000 |
parents | 4c5533df5d72 2dd0bc9f8fd4 |
children | f013210eeceb |
line wrap: on
line diff
--- a/main/MainWindow.cpp Tue Dec 06 09:47:47 2016 +0000 +++ b/main/MainWindow.cpp Wed Dec 14 14:28:41 2016 +0000 @@ -2407,9 +2407,11 @@ QString description; +//!!!??? + sv_samplerate_t ssr = getMainModel()->getSampleRate(); sv_samplerate_t tsr = ssr; - if (m_playSource) tsr = m_playSource->getTargetSampleRate(); + if (m_playSource) tsr = m_playSource->getDeviceSampleRate(); if (ssr != tsr) { description = tr("%1Hz (resampling to %2Hz)").arg(ssr).arg(tsr); @@ -2949,7 +2951,8 @@ { if (!m_recordTarget) return; - QString path = m_recordTarget->getRecordFolder(); + QString path = m_recordTarget->getRecordContainerFolder(); + if (path == "") path = m_recordTarget->getRecordFolder(); if (path == "") return; openLocalFolder(path); @@ -4605,6 +4608,9 @@ m_preferencesDialog = new PreferencesDialog(this); + connect(m_preferencesDialog, SIGNAL(audioDeviceChanged()), + this, SLOT(recreateAudioIO())); + // DeleteOnClose is safe here, because m_preferencesDialog is a // QPointer that will be zeroed when the dialog is deleted. We // use it in preference to leaving the dialog lying around because