diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2013-02-07 21:24:46 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2013-02-07 21:24:46 +0000 |
| commit | 902abc5f16e90a0c1097c3d6bc932ea53aaea142 (patch) | |
| tree | 51acbd864bf273262c894a73f02ce25bd20075a7 /muse2/muse/audio.cpp | |
| parent | 2f4156822ef88a9aef541547da5055561c4e6ab6 (diff) | |
metronome work
Diffstat (limited to 'muse2/muse/audio.cpp')
| -rw-r--r-- | muse2/muse/audio.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp index b9f1ee8c..29d6971e 100644 --- a/muse2/muse/audio.cpp +++ b/muse2/muse/audio.cpp @@ -924,20 +924,19 @@ void Audio::startRolling() && MusEGlobal::song->click() && !MusEGlobal::extSyncFlag.value() && MusEGlobal::song->record()) { -// DELETETHIS 14 or keep? -/* + printf("state = PRECOUNT!\n"); state = PRECOUNT; int z, n; - if (precountFromMastertrackFlag) - AL::sigmap.timesig(playTickPos, z, n); + if (MusEGlobal::precountFromMastertrackFlag) + AL::sigmap.timesig(curTickPos, z, n); else { - z = precountSigZ; - n = precountSigN; + z = MusEGlobal::precountSigZ; + n = MusEGlobal::precountSigN; } - clickno = z * preMeasures; + clickno = z * MusEGlobal::preMeasures; clicksMeasure = z; - ticksBeat = (division * 4)/n; -*/ + ticksBeat = (MusEGlobal::config.division * 4)/n; + } else { // |