comparison framework/MainWindowBase.cpp @ 514:68ab0fe3bce4 3.0-integration

Merge from branch "tony-2.0-integration"
author Chris Cannam
date Thu, 04 Feb 2016 11:19:01 +0000
parents 14a81e881b1a 7cf6f5501212
children 51befd6165a3 a2a8fa0eed08
comparison
equal deleted inserted replaced
512:aecd5bdfc71f 514:68ab0fe3bce4
2203 m_audioIO->suspend(); // start in suspended state 2203 m_audioIO->suspend(); // start in suspended state
2204 m_playSource->setSystemPlaybackTarget(m_audioIO); 2204 m_playSource->setSystemPlaybackTarget(m_audioIO);
2205 } else { 2205 } else {
2206 m_playTarget = breakfastquay::AudioFactory:: 2206 m_playTarget = breakfastquay::AudioFactory::
2207 createCallbackPlayTarget(m_playSource); 2207 createCallbackPlayTarget(m_playSource);
2208 m_playTarget->suspend(); // start in suspended state
2208 m_playSource->setSystemPlaybackTarget(m_playTarget); 2209 m_playSource->setSystemPlaybackTarget(m_playTarget);
2209 } 2210 }
2210 2211
2211 if (!m_playTarget && !m_audioIO) { 2212 if (!m_playTarget && !m_audioIO) {
2212 emit hideSplash(); 2213 emit hideSplash();
2661 stop(); 2662 stop();
2662 QAction *action = qobject_cast<QAction *>(sender()); 2663 QAction *action = qobject_cast<QAction *>(sender());
2663 if (action) action->setChecked(false); 2664 if (action) action->setChecked(false);
2664 } else { 2665 } else {
2665 if (m_audioIO) m_audioIO->resume(); 2666 if (m_audioIO) m_audioIO->resume();
2667 else if (m_playTarget) m_playTarget->resume();
2666 playbackFrameChanged(m_viewManager->getPlaybackFrame()); 2668 playbackFrameChanged(m_viewManager->getPlaybackFrame());
2667 m_playSource->play(m_viewManager->getPlaybackFrame()); 2669 m_playSource->play(m_viewManager->getPlaybackFrame());
2668 } 2670 }
2669 } 2671 }
2670 2672
2702 return; 2704 return;
2703 } 2705 }
2704 } 2706 }
2705 2707
2706 m_audioIO->resume(); 2708 m_audioIO->resume();
2709
2707 WritableWaveFileModel *model = m_recordTarget->startRecording(); 2710 WritableWaveFileModel *model = m_recordTarget->startRecording();
2708 if (!model) { 2711 if (!model) {
2709 cerr << "ERROR: MainWindowBase::record: Recording failed" << endl; 2712 cerr << "ERROR: MainWindowBase::record: Recording failed" << endl;
2710 //!!! report 2713 //!!! report
2711 if (action) action->setChecked(false); 2714 if (action) action->setChecked(false);
3039 } 3042 }
3040 3043
3041 m_playSource->stop(); 3044 m_playSource->stop();
3042 3045
3043 if (m_audioIO) m_audioIO->suspend(); 3046 if (m_audioIO) m_audioIO->suspend();
3047 else if (m_playTarget) m_playTarget->suspend();
3044 3048
3045 if (m_paneStack && m_paneStack->getCurrentPane()) { 3049 if (m_paneStack && m_paneStack->getCurrentPane()) {
3046 updateVisibleRangeDisplay(m_paneStack->getCurrentPane()); 3050 updateVisibleRangeDisplay(m_paneStack->getCurrentPane());
3047 } else { 3051 } else {
3048 m_myStatusMessage = ""; 3052 m_myStatusMessage = "";