comparison main/MainWindow.cpp @ 307:d4ff14feca76

* Make it possible to record live MIDI to a note layer.
  Now we're a proper MIDI sequencer. Ha, ha.

 #include "base/Preferences.h"
 #include "layer/WaveformLayer.h"
 #include "layer/TimeRulerLayer.h"
 #include "layer/TimeInstantLayer.h"
 #include "layer/TimeValueLayer.h"
+#include "layer/NoteLayer.h"
 #include "layer/Colour3DPlotLayer.h"
 #include "layer/SliceLayer.h"
 #include "layer/SliceableLayer.h"
 #include "layer/ImageLayer.h"
 #include "widgets/Fader.h"

     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),

 }
 
 void
 MainWindow::midiEventsAvailable()
 {
+    Pane *currentPane = 0;
+    NoteLayer *currentNoteLayer = 0;
+
+    if (m_paneStack) currentPane = m_paneStack->getCurrentPane();
+    if (currentPane) {
+        currentNoteLayer = dynamic_cast<NoteLayer *>
+            (currentPane->getSelectedLayer());
+    }
+
     // 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());
+
+        if (currentNoteLayer) {
+
+            if (ev.getMessageType() == MIDIConstants::MIDI_NOTE_ON) {
+
+                currentNoteLayer->addNoteOn(ev.getTime(),
+                                            ev.getPitch(),
+                                            ev.getVelocity());
+
+            } else if (ev.getMessageType() == MIDIConstants::MIDI_NOTE_OFF) {
+
+                currentNoteLayer->addNoteOff(ev.getTime(),
+                                             ev.getPitch());
+
+            }
+
+        } else {
+            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"
+    Pane *currentPane = 0;
+    NoteLayer *currentNoteLayer = 0;
+
+    if (m_paneStack) currentPane = m_paneStack->getCurrentPane();
+    if (currentPane) {
+        currentNoteLayer = dynamic_cast<NoteLayer *>(currentPane->getSelectedLayer());
+    }
+
+    if (currentNoteLayer) {
+        currentNoteLayer->abandonNoteOns();
+    }
 }
 
 void
 MainWindow::layerRemoved(Layer *layer)
 {