Left piano take 3 (#50)

src/editor/EditState.cpp

@@ -45,7 +45,7 @@ MouseEditState::MouseEditState()
       last_pitch(EVENTDEFAULT_KEY),
       start_clock(0),
       current_clock(0),
-      kind(MouseKeyboardEdit({0, 0})),
+      kind(MouseKeyboardEdit({MouseMainKeyboard{0}, 0})),
       selection(std::nullopt) {}
 
 QDataStream &operator<<(QDataStream &out, const MouseEditState &a) {

src/editor/EditState.h

@@ -12,16 +12,39 @@
 #include "protocol/SerializeVariant.h"
 #include "pxtone/pxtnMaster.h"
 
-struct MouseKeyboardEdit {
+struct MouseLeftKeyboard {
+  qint32 start_vel;
+};
+inline QDataStream &operator<<(QDataStream &out, const MouseLeftKeyboard &a) {
+  out << a.start_vel;
+  return out;
+}
+inline QDataStream &operator>>(QDataStream &in, MouseLeftKeyboard &a) {
+  in >> a.start_vel;
+  return in;
+}
+
+struct MouseMainKeyboard {
   qint32 start_pitch;
+};
+inline QDataStream &operator<<(QDataStream &out, const MouseMainKeyboard &a) {
+  out << a.start_pitch;
+  return out;
+}
+inline QDataStream &operator>>(QDataStream &in, MouseMainKeyboard &a) {
+  in >> a.start_pitch;
+  return in;
+}
+struct MouseKeyboardEdit {
+  std::variant<MouseLeftKeyboard, MouseMainKeyboard> kind;
   qint32 current_pitch;
 };
 inline QDataStream &operator<<(QDataStream &out, const MouseKeyboardEdit &a) {
-  out << a.start_pitch << a.current_pitch;
+  out << a.kind << a.current_pitch;
   return out;
 }
 inline QDataStream &operator>>(QDataStream &in, MouseKeyboardEdit &a) {
-  in >> a.start_pitch >> a.current_pitch;
+  in >> a.kind >> a.current_pitch;
   return in;
 }
 

src/editor/EditorScrollArea.cpp

@@ -27,7 +27,8 @@ EditorScrollArea::EditorScrollArea(QWidget *parent, bool match_scale)
       mouseDown(false),
       m_match_scale(match_scale),
       lastPos(),
-      anim(new Animation(this)) {
+      anim(new Animation(this)),
+      m_scroll_with_mouse_x(true) {
   setWidgetResizable(true);
   setMouseTracking(true);
   setFrameStyle(QFrame::NoFrame);
@@ -40,7 +41,7 @@ EditorScrollArea::EditorScrollArea(QWidget *parent, bool match_scale)
     // scrolling.
     if (!(QApplication::mouseButtons() & (Qt::LeftButton | Qt::RightButton)))
       mouseDown = false;
-    if (mouseDown) scrollWithMouseX();
+    if (mouseDown && m_scroll_with_mouse_x) scrollWithMouseX();
   });
 }
 
@@ -195,6 +196,10 @@ void EditorScrollArea::ensureWithinMargin(int x, qreal minDistFromLeft,
   }
 }
 
+void EditorScrollArea::setEnableScrollWithMouseX(bool b) {
+  m_scroll_with_mouse_x = b;
+}
+
 constexpr int JUMP_MAX = 10;
 constexpr int MARGIN_MAX = 100;
 constexpr double MARGIN_FRAC = 0.25;

src/editor/EditorScrollArea.h

@@ -16,6 +16,7 @@ class EditorScrollArea : public QScrollArea {
   void ensureWithinMargin(int x, qreal minDistFromLeft,
                           qreal jumpMinDistFromLeft, qreal jumpMaxDistFromLeft,
                           qreal maxDistFromLeft);
+  void setEnableScrollWithMouseX(bool);
  signals:
   void viewportChanged(const QRect &viewport);
 
@@ -27,6 +28,7 @@ class EditorScrollArea : public QScrollArea {
   bool m_match_scale;
   QPoint lastPos;
   Animation *anim;
+  bool m_scroll_with_mouse_x;
   bool event(QEvent *e) override;
   void mousePressEvent(QMouseEvent *event) override;
   void mouseMoveEvent(QMouseEvent *event) override;

src/editor/EditorWindow.cpp

@@ -111,6 +111,8 @@ EditorWindow::EditorWindow(QWidget *parent)
   m_scroll_area->setWidget(m_keyboard_view);
 
   // TODO: find a better place for this.
+  connect(m_keyboard_view, &KeyboardView::setScrollOnClick, m_scroll_area,
+          &EditorScrollArea::setEnableScrollWithMouseX);
   connect(m_keyboard_view, &KeyboardView::ensureVisibleX,
           [this](int x, bool strict) {
             if (!strict)

src/editor/StyleEditor.cpp

@@ -114,6 +114,8 @@ void loadConfig(const QString &path, Config &c) {
   setConfigColor(styleConfig, c.color.KeyboardBlackNote, "keyboard/BlackNote");
   setConfigColor(styleConfig, c.color.KeyboardWhiteLeft, "keyboard/WhiteLeft");
   setConfigColor(styleConfig, c.color.KeyboardBlackLeft, "keyboard/BlackLeft");
+  setConfigColor(styleConfig, c.color.KeyboardBlackLeftInner,
+                 "keyboard/BlackLeftInner");
   setConfigColor(styleConfig, c.color.KeyboardBlack, "keyboard/Black");
   setConfigColor(styleConfig, c.color.KeyboardMeasure, "keyboard/Measure");
 

src/editor/StyleEditor.h

@@ -33,6 +33,7 @@ struct Config {
     QColor KeyboardBlackNote;
     QColor KeyboardWhiteLeft;
     QColor KeyboardBlackLeft;
+    QColor KeyboardBlackLeftInner;
     QColor KeyboardBlack;
     QColor KeyboardMeasure;
 

src/editor/audio/NotePreview.cpp

@@ -63,15 +63,7 @@ NotePreview::NotePreview(const pxtnService *pxtn, const mooParams *moo_params,
 
   // We don't constantly reset because sometimes the audio engine forces
   // [life_count = 0] (say at the end of the sample)
-  if (m_unit != nullptr) {
-    std::shared_ptr<const pxtnWoice> woice = m_this_unit->get_woice();
-    for (int i = 0; i < woice->get_voice_num(); ++i) {
-      // TODO: calculating the life count should be more automatic.
-      auto tone = m_this_unit->get_tone(i);
-      tone->on_count = duration;
-      tone->life_count = duration + woice->get_instance(i)->env_release;
-    }
-  }
+  if (m_unit != nullptr) resetOn(duration);
   if (m_moo_state != nullptr) {
     for (auto &unit : m_moo_state->units) {
       pxtnUnitTone *u = &unit;
@@ -109,6 +101,18 @@ void NotePreview::processEvent(EVENTKIND kind, int32_t value) {
   m_moo_params->processNonOnEvent(m_this_unit, kind, value, m_pxtn);
 }
 
+void NotePreview::resetOn(int duration) {
+  std::shared_ptr<const pxtnWoice> woice = m_this_unit->get_woice();
+  for (int i = 0; i < woice->get_voice_num(); ++i) {
+    // TODO: calculating the life count should be more automatic.
+    auto tone = m_this_unit->get_tone(i);
+    *tone = pxtnVOICETONE(tone->env_release_clock, tone->offset_freq,
+                          woice->get_instance(i)->env_size != 0);
+    tone->on_count = duration;
+    tone->life_count = duration + woice->get_instance(i)->env_release;
+  }
+}
+
 static EVERECORD ev(int32_t clock, EVENTKIND kind, int32_t value) {
   EVERECORD e;
   e.clock = clock;

src/editor/audio/NotePreview.h

@@ -28,6 +28,7 @@ class NotePreview : public QObject {
               int vel, int duration, std::shared_ptr<const pxtnWoice> woice,
               int bufferSize, QObject *parent);
   void processEvent(EVENTKIND kind, int32_t value);
+  void resetOn(int duration);
   ~NotePreview();
 
  private: