Merge pull request #166 from muelleki/17906-chords

#17906: Chord input from MIDI works again
musescore · Jan 21, 2013 · 0bc14e8 · 0bc14e8 · krlmlr · Jan 21, 2013
2 parents 12cd120 + e8159e1
commit 0bc14e8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -384,9 +384,12 @@ qDebug("add pitch %d %d", pitch, addFlag);
             Note* n = addNote(chord, pitch);
             setLayoutAll(false);
             setLayout(chord->measure());
-            moveToNextInputPos();
             return n;
             }
+      if (_is.moveBeforeAdding())
+            moveToNextInputPos();
+      else
+          _is.setMoveBeforeAdding(true);
       expandVoice();
 
       // insert note
@@ -444,7 +447,6 @@ qDebug("add pitch %d %d", pitch, addFlag);
                   qDebug("addPitch: cannot find slur note");
             setLayoutAll(true);
             }
-      moveToNextInputPos();
       return note;
       }
 
@@ -1573,7 +1575,9 @@ bool Score::processMidiInput()
                         startCmd();
                         cmdActive = true;
                         }
-                  n = addPitch(ev.pitch, ev.chord);
+                  Note* n2 = addPitch(ev.pitch, ev.chord);
+                  if (n2)
+                        n = n2;
                   }
             }
       if (cmdActive) {

diff --git a/libmscore/input.cpp b/libmscore/input.cpp
@@ -32,6 +32,7 @@ InputState::InputState() :
    _segment(0),
    _string(VISUAL_STRING_NONE),
    _repitchMode(false),
+   _moveBeforeAdding(false),
    rest(false),
    pitch(72),
    noteType(NOTE_NORMAL),

diff --git a/libmscore/input.h b/libmscore/input.h
@@ -34,6 +34,7 @@ class InputState {
       Segment*    _segment;         // current segment
       int         _string;          // visual string selected for input (TAB staves only)
       bool        _repitchMode;
+      bool        _moveBeforeAdding;
 
    public:
       bool rest;              // rest mode
@@ -70,6 +71,9 @@ class InputState {
       bool repitchMode() const            { return _repitchMode;    }
       void setRepitchMode(bool val)       { _repitchMode = val;     }
 
+      bool moveBeforeAdding() const       { return _moveBeforeAdding;    }
+      void setMoveBeforeAdding(bool val)  { _moveBeforeAdding = val;     }
+
       StaffGroup staffGroup() const;
       };
 

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2705,6 +2705,7 @@ void Score::setInputState(Element* e)
             e = static_cast<Chord*>(e)->upNote();
 
       _is.setDrumNote(-1);
+      _is.setMoveBeforeAdding(false);
 //      _is.setDrumset(0);
       if (e->type() == Element::NOTE) {
             Note* note    = static_cast<Note*>(e);

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -3501,7 +3501,9 @@ void ScoreView::adjustCanvasPosition(const Element* el, bool playBack)
             }
 
       const Measure* m;
-      if (el->type() == Element::NOTE)
+      if (!el)
+            return;
+      else if (el->type() == Element::NOTE)
             m = static_cast<const Note*>(el)->chord()->measure();
       else if (el->type() == Element::REST)
             m = static_cast<const Rest*>(el)->measure();