diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-12-07 03:27:48 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-12-07 03:27:48 +0000 |
| commit | 8e9886770af1022d88e6f92ff4fcceb3e50d0e55 (patch) | |
| tree | fb42340c5d7a75278b7ed37478f066324fa59dde /muse2/muse/importmidi.cpp | |
| parent | 45f13100f9b5d0fd5a9f4950e135c2ed6de0429c (diff) | |
Built Awl::posedit and Awl::sigedit, and replaced /widget versions and all usages.
Reverted class SpinBox to previous revision.
Diffstat (limited to 'muse2/muse/importmidi.cpp')
| -rw-r--r-- | muse2/muse/importmidi.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/muse2/muse/importmidi.cpp b/muse2/muse/importmidi.cpp index 63cccffc..e844bb43 100644 --- a/muse2/muse/importmidi.cpp +++ b/muse2/muse/importmidi.cpp @@ -240,7 +240,8 @@ bool MusE::importMidi(const QString name, bool merge) song->initLen(); int z, n; - sigmap.timesig(0, z, n); + ///sigmap.timesig(0, z, n); + AL::sigmap.timesig(0, z, n); int tempo = tempomap.tempo(0); transport->setTimesig(z, n); @@ -300,7 +301,8 @@ void MusE::processTrack(MidiTrack* track) int bar2, beat; unsigned tick; - sigmap.tickValues(len, &bar2, &beat, &tick); + ///sigmap.tickValues(len, &bar2, &beat, &tick); + AL::sigmap.tickValues(len, &bar2, &beat, &tick); int lastOff = 0; int st = -1; // start tick current part @@ -308,7 +310,8 @@ void MusE::processTrack(MidiTrack* track) int x2 = 0; // end tick current measure for (int bar = 0; bar < bar2; ++bar, x1 = x2) { - x2 = sigmap.bar2tick(bar+1, 0, 0); + ///x2 = sigmap.bar2tick(bar+1, 0, 0); + x2 = AL::sigmap.bar2tick(bar+1, 0, 0); if (lastOff > x2) { // this measure is busy! continue; |