LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #497 from trig-ger/midi_fixes

Browse source 
fix #22093: Crash when selecting fixed pitch LH/RH separation
This commit is contained in:
Nicolas Froment 2013-10-01 12:58:37 -07:00
commit e8d0918988
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mscore/importmidi_lrhand.cpp
View file

@ -40,7 +40,7 @@ void splitByFixedPitch(std::multimap<int, MTrack> &tracks,
+ (int)trackOpers.LHRH.splitPitchNote;
std::multimap<ReducedFraction, MidiChord> leftHandChords;
for (auto i = srcTrack.chords.begin(); i != srcTrack.chords.end(); ++i) {
for (auto i = srcTrack.chords.begin(); i != srcTrack.chords.end(); ) {
auto &notes = i->second.notes;
QList<MidiNote> leftHandNotes;
for (auto j = notes.begin(); j != notes.end(); ) {
@ -54,6 +54,11 @@ void splitByFixedPitch(std::multimap<int, MTrack> &tracks,
}
if (!leftHandNotes.empty())
addNewLeftHandChord(leftHandChords, leftHandNotes, i);
if (notes.isEmpty()) {
i = srcTrack.chords.erase(i);
continue;
}
++i;
}
if (!leftHandChords.empty())
insertNewLeftHandTrack(tracks, it, leftHandChords);
@ -67,7 +72,7 @@ void splitByHandWidth(std::multimap<int, MTrack> &tracks,
const int octave = 12;
std::multimap<ReducedFraction, MidiChord> leftHandChords;
// chords after MIDI import are sorted by onTime values
for (auto i = srcTrack.chords.begin(); i != srcTrack.chords.end(); ++i) {
for (auto i = srcTrack.chords.begin(); i != srcTrack.chords.end(); ) {
auto &notes = i->second.notes;
QList<MidiNote> leftHandNotes;
const int minPitch = notes.front().pitch;
@ -97,6 +102,11 @@ void splitByHandWidth(std::multimap<int, MTrack> &tracks,
}
if (!leftHandNotes.empty())
addNewLeftHandChord(leftHandChords, leftHandNotes, i);
if (notes.isEmpty()) {
i = srcTrack.chords.erase(i);
continue;
}
++i;
}
if (!leftHandChords.empty())
insertNewLeftHandTrack(tracks, it, leftHandChords);