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/midi.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/midi.cpp')
| -rw-r--r-- | muse2/muse/midi.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp index efabfe95..c1a24c8e 100644 --- a/muse2/muse/midi.cpp +++ b/muse2/muse/midi.cpp @@ -442,7 +442,8 @@ void buildMidiEventList(EventList* del, const MPEventList* el, MidiTrack* track, for (int i = 0; i < n; i++) timesig_n *= 2; int ltick = CALC_TICK(tick);//(tick * config.division + div/2) / div; - sigmap.add(ltick, timesig_z, timesig_n); + ///sigmap.add(ltick, timesig_z, timesig_n); + AL::sigmap.add(ltick, AL::TimeSignature(timesig_z, timesig_n)); } break; case 0x59: // Key Signature @@ -1405,7 +1406,8 @@ void Audio::processMidi() bool isMeasure = false; while (midiClick < nextTickPos) { if (isPlaying()) { - sigmap.tickValues(midiClick, &bar, &beat, &tick); + ///sigmap.tickValues(midiClick, &bar, &beat, &tick); + AL::sigmap.tickValues(midiClick, &bar, &beat, &tick); isMeasure = beat == 0; } else if (state == PRECOUNT) { @@ -1455,7 +1457,8 @@ void Audio::processMidi() } if (isPlaying()) - midiClick = sigmap.bar2tick(bar, beat+1, 0); + ///midiClick = sigmap.bar2tick(bar, beat+1, 0); + midiClick = AL::sigmap.bar2tick(bar, beat+1, 0); else if (state == PRECOUNT) { midiClick += ticksBeat; if (clickno) |