Mercurial > hg > svapp

changeset 526:d5ca6c5bad13 piper

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Thu, 20 Oct 2016 11:19:34 +0100
parents f257967855e2 (current diff) 3ab6a5f7aca8 (diff)
children 227291052aa9
files svapp.pro
diffstat 2 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Fri Oct 14 14:33:32 2016 +0100
+++ b/framework/MainWindowBase.cpp	Thu Oct 20 11:19:34 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	Fri Oct 14 14:33:32 2016 +0100
+++ b/svapp.pro	Thu Oct 20 11:19:34 2016 +0100
@@ -10,15 +10,18 @@
 !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
         LIBS += -L../sv-dependency-builds/win32-mingw/lib
     }
     win32-msvc* {
-        INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include
-        LIBS += -L../sv-dependency-builds/win32-msvc/lib
+        # We actually expect MSVC to be used only for 64-bit builds,
+        # though the qmake spec is still called win32-msvc*
+        INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include
+        LIBS += -L../sv-dependency-builds/win64-msvc/lib
     }
     macx* {
         INCLUDEPATH += ../sv-dependency-builds/osx/include
@@ -31,6 +34,10 @@
     macx* {
         DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO
     }
+    win32-msvc* {
+        DEFINES += NOMINMAX _USE_MATH_DEFINES
+        DEFINES -= HAVE_LIBLO
+    }
 }
 
 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11