comparison framework/MainWindowBase.cpp @ 527:8d873a022873 3.0-integration

Merge from branch "msvc2015_64"
author Chris Cannam
date Thu, 20 Oct 2016 11:20:01 +0100
parents 3ab6a5f7aca8
children dd195633fc9f
comparison
equal deleted inserted replaced
522:1682dd81d0ef 527:8d873a022873
2244 */ 2244 */
2245 2245
2246 if (m_soundOptions & WithAudioInput) { 2246 if (m_soundOptions & WithAudioInput) {
2247 m_audioIO = breakfastquay::AudioFactory:: 2247 m_audioIO = breakfastquay::AudioFactory::
2248 createCallbackIO(m_recordTarget, m_playSource); 2248 createCallbackIO(m_recordTarget, m_playSource);
2249 m_audioIO->suspend(); // start in suspended state 2249 if (m_audioIO) {
2250 m_playSource->setSystemPlaybackTarget(m_audioIO); 2250 m_audioIO->suspend(); // start in suspended state
2251 m_playSource->setSystemPlaybackTarget(m_audioIO);
2252 }
2251 } else { 2253 } else {
2252 m_playTarget = breakfastquay::AudioFactory:: 2254 m_playTarget = breakfastquay::AudioFactory::
2253 createCallbackPlayTarget(m_playSource); 2255 createCallbackPlayTarget(m_playSource);
2254 m_playTarget->suspend(); // start in suspended state 2256 if (m_playTarget) {
2255 m_playSource->setSystemPlaybackTarget(m_playTarget); 2257 m_playTarget->suspend(); // start in suspended state
2258 m_playSource->setSystemPlaybackTarget(m_playTarget);
2259 }
2256 } 2260 }
2257 2261
2258 if (!m_playTarget && !m_audioIO) { 2262 if (!m_playTarget && !m_audioIO) {
2259 emit hideSplash(); 2263 emit hideSplash();
2260 2264