comparison main/MainWindow.cpp @ 308:4ad11b1cf050

* Handle zero-velocity note ons as well as note offs (can't believe I
  fell for that one)
* Add Peek Left / Peek Right (alt+left/right) and change peek-drag
  (i.e. dragging without moving playback pointer or other panes) from
  ctrl+drag to alt+drag for symmetry

 	
     action = new QAction(tr("J&ump Right"), this);
     action->setShortcut(tr("Ctrl+Right"));
     action->setStatusTip(tr("Scroll the current pane a big step to the right"));
     connect(action, SIGNAL(triggered()), this, SLOT(jumpRight()));
+    connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
+
+    action = new QAction(tr("Peek Left"), this);
+    action->setShortcut(tr("Alt+Left"));
+    action->setStatusTip(tr("Scroll the current pane to the left without moving the playback cursor or other panes"));
+    connect(action, SIGNAL(triggered()), this, SLOT(peekLeft()));
+    connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
+	
+    action = new QAction(tr("Peek Right"), this);
+    action->setShortcut(tr("Alt+Right"));
+    action->setStatusTip(tr("Scroll the current pane to the right without moving the playback cursor or other panes"));
+    connect(action, SIGNAL(triggered()), this, SLOT(peekRight()));
     connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 
     menu->addSeparator();

     // (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());
 
+        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 &&
+                         ev.getVelocity() == 0));
+
         if (currentNoteLayer) {
 
-            if (ev.getMessageType() == MIDIConstants::MIDI_NOTE_ON) {
+            if (noteOn) {
 
                 currentNoteLayer->addNoteOn(ev.getTime(),
                                             ev.getPitch(),
                                             ev.getVelocity());
 
-            } else if (ev.getMessageType() == MIDIConstants::MIDI_NOTE_OFF) {
+            } else if (noteOff) {
 
                 currentNoteLayer->addNoteOff(ev.getTime(),
                                              ev.getPitch());
 
             }
 
         } else {
-            if (ev.getMessageType() != MIDIConstants::MIDI_NOTE_ON) {
-                continue;
-            }
+
+            if (!noteOn) continue;
             insertInstantAt(ev.getTime());
         }
     }
 }