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

Move overlapping notes check function

Browse source
This commit is contained in:
Andrey M. Tokarev 2014-04-02 10:16:51 +04:00
parent 8e48cbdbc4
commit 8ca70674ac
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mscore/importmidi.cpp
View file

@ -162,10 +162,6 @@ void quantizeAllTracks(std::multimap<int, MTrack> &tracks,
"There are overlapping notes of the same voice that is incorrect");
Quantize::quantizeChords(mtrack.chords, mtrack.tuplets, sigmap);
Q_ASSERT_X(!doNotesOverlap(track.second),
"quantizeAllTracks",
"There are overlapping notes of the same voice that is incorrect");
}
}
@ -933,6 +929,9 @@ void convertMidi(Score *score, const MidiFile *mf)
quantizeAllTracks(tracks, sigmap, lastTick);
Q_ASSERT_X(!doNotesOverlap(tracks),
"convertMidi", "There are overlapping notes of the same voice that is incorrect");
Q_ASSERT_X(noTooShortNotes(tracks),
"convertMidi", "There are notes of length < min allowed duration");