comparison framework/MainWindowBase.cpp @ 161:f90e277d2876

* Somewhat better MIDI-based time instant timing

 using std::vector;
 using std::map;
 using std::set;
 
 
-MainWindowBase::MainWindowBase(bool withAudioOutput, bool withOSCSupport) :
+MainWindowBase::MainWindowBase(bool withAudioOutput,
+                               bool withOSCSupport,
+                               bool withMIDIInput) :
     m_document(0),
     m_paneStack(0),
     m_viewManager(0),
     m_timeRulerLayer(0),
     m_audioOutput(withAudioOutput),

     settings.endGroup();
 
     m_labeller = new Labeller(labellerType);
     m_labeller->setCounterCycleSize(cycle);
 
-    m_midiInput = new MIDIInput(QApplication::applicationName());
+    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();

             }
 	}
     }
 }
 
+// FrameTimer method
+
+unsigned long
+MainWindowBase::getFrame() const
+{
+    if (m_playSource && m_playSource->isPlaying()) {
+        return m_playSource->getCurrentPlayingFrame();
+    } else {
+        return m_viewManager->getPlaybackFrame();
+    }
+}    
+
 void
 MainWindowBase::insertInstant()
 {
-    if (m_playSource && m_playSource->isPlaying()) {
-        insertInstantAt(m_playSource->getCurrentPlayingFrame());
-    } else {
-        insertInstantAt(m_viewManager->getPlaybackFrame());
-    }
+    insertInstantAt(getFrame());
 }
 
 void
 MainWindowBase::insertInstantsAtBoundaries()
 {