Mercurial > hg > svapp

changeset 525:3ab6a5f7aca8 msvc2015_64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.
author Chris Cannam
date Wed, 19 Oct 2016 17:33:32 +0100
parents 85c83499be3c
children d5ca6c5bad13 8d873a022873
files framework/MainWindowBase.cpp svapp.pro
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Tue Oct 18 15:56:21 2016 +0100
+++ b/framework/MainWindowBase.cpp	Wed Oct 19 17:33:32 2016 +0100
@@ -2246,13 +2246,17 @@
     if (m_soundOptions & WithAudioInput) {
         m_audioIO = breakfastquay::AudioFactory::
             createCallbackIO(m_recordTarget, m_playSource);
-        m_audioIO->suspend(); // start in suspended state
-        m_playSource->setSystemPlaybackTarget(m_audioIO);
+        if (m_audioIO) {
+            m_audioIO->suspend(); // start in suspended state
+            m_playSource->setSystemPlaybackTarget(m_audioIO);
+        }
     } else {
         m_playTarget = breakfastquay::AudioFactory::
             createCallbackPlayTarget(m_playSource);
-        m_playTarget->suspend(); // start in suspended state
-        m_playSource->setSystemPlaybackTarget(m_playTarget);
+        if (m_playTarget) {
+            m_playTarget->suspend(); // start in suspended state
+            m_playSource->setSystemPlaybackTarget(m_playTarget);
+        }
     }
 
     if (!m_playTarget && !m_audioIO) {
--- a/svapp.pro	Tue Oct 18 15:56:21 2016 +0100
+++ b/svapp.pro	Wed Oct 19 17:33:32 2016 +0100
@@ -10,7 +10,8 @@
 !exists(config.pri) {
 
     CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
+    DEFINES += NDEBUG BUILD_RELEASE
+    DEFINES += NO_TIMING
 
     win32-g++ {
         INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include