comparison main/MainWindow.cpp @ 309:6a276fea550d

* If a time-value layer is current when a midi note event is received,
  place points in it with values based on the midi note pitch class

 void
 MainWindow::midiEventsAvailable()
 {
     Pane *currentPane = 0;
     NoteLayer *currentNoteLayer = 0;
+    TimeValueLayer *currentTimeValueLayer = 0;
 
     if (m_paneStack) currentPane = m_paneStack->getCurrentPane();
     if (currentPane) {
         currentNoteLayer = dynamic_cast<NoteLayer *>
             (currentPane->getSelectedLayer());
+        currentTimeValueLayer = dynamic_cast<TimeValueLayer *>
+            (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

 
     while (m_midiInput->getEventsAvailable() > 0) {
 
         MIDIEvent ev(m_midiInput->readEvent());
 
+        size_t frame = currentPane->alignFromReference(ev.getTime());
+
         bool noteOn = (ev.getMessageType() == MIDIConstants::MIDI_NOTE_ON &&
                        ev.getVelocity() > 0);
 
         bool noteOff = (ev.getMessageType() == MIDIConstants::MIDI_NOTE_OFF ||
                         (ev.getMessageType() == MIDIConstants::MIDI_NOTE_ON &&

 
         if (currentNoteLayer) {
 
             if (noteOn) {
 
-                currentNoteLayer->addNoteOn(ev.getTime(),
+                currentNoteLayer->addNoteOn(frame,
                                             ev.getPitch(),
                                             ev.getVelocity());
 
             } else if (noteOff) {
 
-                currentNoteLayer->addNoteOff(ev.getTime(),
+                currentNoteLayer->addNoteOff(frame,
                                              ev.getPitch());
 
             }
 
-        } else {
+            continue;
+        }
+
+        if (currentTimeValueLayer) {
 
             if (!noteOn) continue;
-            insertInstantAt(ev.getTime());
-        }
+            Model *model = static_cast<Layer *>(currentTimeValueLayer)->getModel();
+            SparseTimeValueModel *tvm =
+                dynamic_cast<SparseTimeValueModel *>(model);
+            if (tvm) {
+                SparseTimeValueModel::Point point(frame, ev.getPitch() % 12, "");
+                SparseTimeValueModel::AddPointCommand *command =
+                    new SparseTimeValueModel::AddPointCommand
+                    (tvm, point, tr("Add Point"));
+                CommandHistory::getInstance()->addCommand(command);
+            }
+            continue;
+
+        }
+
+        if (!noteOn) continue;
+        insertInstantAt(ev.getTime());
     }
 }    
 
 void
 MainWindow::playStatusChanged(bool playing)