Mercurial > hg > svapp
diff framework/MainWindowBase.cpp @ 507:9a125d1c8a22 tony-2.0-integration
Merge from branch "3.0-integration"
author | Chris Cannam |
---|---|
date | Wed, 14 Oct 2015 14:52:46 +0100 |
parents | 74fa499d5f3c |
children | 7cf6f5501212 14a81e881b1a |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Wed Oct 14 10:19:24 2015 +0100 +++ b/framework/MainWindowBase.cpp Wed Oct 14 14:52:46 2015 +0100 @@ -2200,7 +2200,6 @@ createCallbackIO(m_recordTarget, m_playSource); m_audioIO->suspend(); // start in suspended state m_playSource->setSystemPlaybackTarget(m_audioIO); - m_recordTarget->setSystemRecordSource(m_audioIO); } else { m_playTarget = breakfastquay::AudioFactory:: createCallbackPlayTarget(m_playSource); @@ -2702,15 +2701,6 @@ } } - QAction *action = qobject_cast<QAction *>(sender()); - - if (m_audioRecordMode == RecordReplaceSession) { - if (!checkSaveModified()) { - if (action) action->setChecked(false); - return; - } - } - m_audioIO->resume(); WritableWaveFileModel *model = m_recordTarget->startRecording(); if (!model) {