comparison main/MainWindow.cpp @ 305:f76efdd7d180

* Somewhat better MIDI-based time instant timing

 using std::map;
 using std::set;
 
 
 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) :
-    MainWindowBase(withAudioOutput, withOSCSupport),
+    MainWindowBase(withAudioOutput, withOSCSupport, true),
     m_overview(0),
     m_mainMenusCreated(false),
     m_paneMenu(0),
     m_layerMenu(0),
     m_transformsMenu(0),

     m_rightButtonTransformsMenu(0),
     m_rightButtonPlaybackMenu(0),
     m_soloAction(0),
     m_soloModified(false),
     m_prevSolo(false),
+    m_lastInsertedMIDITime(0),
     m_rwdStartAction(0),
     m_rwdAction(0),
     m_ffwdAction(0),
     m_ffwdEndAction(0),
     m_playAction(0),

     m_playAction->setShortcut(tr("Space"));
     m_playAction->setStatusTip(tr("Start or stop playback from the current position"));
     connect(m_playAction, SIGNAL(triggered()), this, SLOT(play()));
     connect(m_playSource, SIGNAL(playStatusChanged(bool)),
 	    m_playAction, SLOT(setChecked(bool)));
+    connect(m_playSource, SIGNAL(playStatusChanged(bool)),
+            this, SLOT(playStatusChanged(bool)));
     connect(this, SIGNAL(canPlay(bool)), m_playAction, SLOT(setEnabled(bool)));
 
     m_ffwdAction = toolbar->addAction(il.load("ffwd"),
                                       tr("Fast Forward"));
     m_ffwdAction->setShortcut(tr("PgDown"));

 }
 
 void
 MainWindow::midiEventsAvailable()
 {
-    //!!! for now.  but this won't do -- we are passing a signal/slot
-    //!!! connection across threads here, so timing will not be good
-    //!!! -- we do need to use the original midi event timestamp
-    MIDIEvent ev(m_midiInput->readEvent());
-    if (ev.getMessageType() == MIDIConstants::MIDI_NOTE_ON) {
-        insertInstant();
+    // This is called through a serialised signal/slot invocation
+    // (across threads).  It could happen quite some time after the
+    // event was actually received, which is why event timestamping
+    // happens in the MIDI input class and not here.
+    while (m_midiInput->getEventsAvailable() > 0) {
+        MIDIEvent ev(m_midiInput->readEvent());
+        if (ev.getMessageType() != MIDIConstants::MIDI_NOTE_ON) {
+            continue;
+        }
+        insertInstantAt(ev.getTime());
     }
 }    
+
+void
+MainWindow::playStatusChanged(bool playing)
+{
+    m_lastInsertedMIDITime = -1.0; // <0 means "never during this playback"
+}
 
 void
 MainWindow::layerRemoved(Layer *layer)
 {
     setupExistingLayersMenus();