Mercurial > hg > svapp

changeset 328:28c17ce7a6e9 tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from tonioni branch
author Chris Cannam
date Tue, 28 Jan 2014 15:02:15 +0000
parents c837368b1faf (diff) d2c13ec0f148 (current diff)
children 1e3af7f4fa86
files audioio/AudioCoreAudioTarget.cpp audioio/AudioCoreAudioTarget.h audioio/audioio.pro framework/MainWindowBase.cpp framework/framework.pro
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Fri Jan 17 11:59:49 2014 -0500
+++ b/framework/MainWindowBase.cpp	Tue Jan 28 15:02:15 2014 +0000
@@ -133,7 +133,6 @@
 #endif
 
 MainWindowBase::MainWindowBase(bool withAudioOutput,
-                               bool withOSCSupport,
                                bool withMIDIInput) :
     m_document(0),
     m_paneStack(0),
@@ -254,12 +253,6 @@
     if (withMIDIInput) {
         m_midiInput = new MIDIInput(QApplication::applicationName(), this);
     }
-
-    if (withOSCSupport) {
-        m_oscQueueStarter = new OSCQueueStarter(this);
-        connect(m_oscQueueStarter, SIGNAL(finished()), this, SLOT(oscReady()));
-        m_oscQueueStarter->start();
-    }
 }
 
 MainWindowBase::~MainWindowBase()
@@ -270,6 +263,7 @@
     delete m_playSource;
     delete m_viewManager;
     delete m_oscQueue;
+    delete m_oscQueueStarter;
     delete m_midiInput;
     Profiles::getInstance()->dump();
 }
@@ -285,6 +279,14 @@
 }
 
 void
+MainWindowBase::startOSCQueue()
+{
+    m_oscQueueStarter = new OSCQueueStarter(this);
+    connect(m_oscQueueStarter, SIGNAL(finished()), this, SLOT(oscReady()));
+    m_oscQueueStarter->start();
+}
+
+void
 MainWindowBase::oscReady()
 {
     if (m_oscQueue && m_oscQueue->isOK()) {
--- a/framework/MainWindowBase.h	Fri Jan 17 11:59:49 2014 -0500
+++ b/framework/MainWindowBase.h	Tue Jan 28 15:02:15 2014 +0000
@@ -75,7 +75,7 @@
     Q_OBJECT
 
 public:
-    MainWindowBase(bool withAudioOutput, bool withOSCSupport, bool withMIDIInput);
+    MainWindowBase(bool withAudioOutput, bool withMIDIInput);
     virtual ~MainWindowBase();
     
     enum AudioFileOpenMode {
@@ -309,6 +309,7 @@
 
     OSCQueue                *m_oscQueue;
     OSCQueueStarter         *m_oscQueueStarter;
+    void startOSCQueue();
 
     MIDIInput               *m_midiInput;