Mercurial > hg > svapp
comparison 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 |
comparison
equal
deleted
inserted
replaced
502:bfe468c89d30 | 507:9a125d1c8a22 |
---|---|
2198 if (m_soundOptions & WithAudioInput) { | 2198 if (m_soundOptions & WithAudioInput) { |
2199 m_audioIO = breakfastquay::AudioFactory:: | 2199 m_audioIO = breakfastquay::AudioFactory:: |
2200 createCallbackIO(m_recordTarget, m_playSource); | 2200 createCallbackIO(m_recordTarget, m_playSource); |
2201 m_audioIO->suspend(); // start in suspended state | 2201 m_audioIO->suspend(); // start in suspended state |
2202 m_playSource->setSystemPlaybackTarget(m_audioIO); | 2202 m_playSource->setSystemPlaybackTarget(m_audioIO); |
2203 m_recordTarget->setSystemRecordSource(m_audioIO); | |
2204 } else { | 2203 } else { |
2205 m_playTarget = breakfastquay::AudioFactory:: | 2204 m_playTarget = breakfastquay::AudioFactory:: |
2206 createCallbackPlayTarget(m_playSource); | 2205 createCallbackPlayTarget(m_playSource); |
2207 m_playSource->setSystemPlaybackTarget(m_playTarget); | 2206 m_playSource->setSystemPlaybackTarget(m_playTarget); |
2208 } | 2207 } |
2689 } | 2688 } |
2690 | 2689 |
2691 if (m_recordTarget->isRecording()) { | 2690 if (m_recordTarget->isRecording()) { |
2692 stop(); | 2691 stop(); |
2693 return; | 2692 return; |
2694 } | |
2695 | |
2696 QAction *action = qobject_cast<QAction *>(sender()); | |
2697 | |
2698 if (m_audioRecordMode == RecordReplaceSession) { | |
2699 if (!checkSaveModified()) { | |
2700 if (action) action->setChecked(false); | |
2701 return; | |
2702 } | |
2703 } | 2693 } |
2704 | 2694 |
2705 QAction *action = qobject_cast<QAction *>(sender()); | 2695 QAction *action = qobject_cast<QAction *>(sender()); |
2706 | 2696 |
2707 if (m_audioRecordMode == RecordReplaceSession) { | 2697 if (m_audioRecordMode == RecordReplaceSession) { |