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/pos.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/pos.cpp')
| -rw-r--r-- | muse2/muse/pos.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/muse2/muse/pos.cpp b/muse2/muse/pos.cpp index aa9538ca..15327af8 100644 --- a/muse2/muse/pos.cpp +++ b/muse2/muse/pos.cpp @@ -12,7 +12,8 @@ #include "xml.h" #include "tempo.h" #include "globals.h" -#include "sig.h" +///#include "sig.h" +#include "al/sig.h" extern int mtcType; @@ -53,14 +54,14 @@ Pos::Pos(const QString& s) { int m, b, t; sscanf(s.latin1(), "%04d.%02d.%03d", &m, &b, &t); - _tick = sigmap.bar2tick(m, b, t); + _tick = AL::sigmap.bar2tick(m, b, t); _type = TICKS; sn = -1; } Pos::Pos(int measure, int beat, int tick) { - _tick = sigmap.bar2tick(measure, beat, tick); + _tick = AL::sigmap.bar2tick(measure, beat, tick); _type = TICKS; sn = -1; } @@ -516,7 +517,7 @@ void PosLen::setPos(const Pos& pos) void Pos::mbt(int* bar, int* beat, int* tk) const { - sigmap.tickValues(tick(), bar, beat, (unsigned*)tk); + AL::sigmap.tickValues(tick(), bar, beat, (unsigned*)tk); } //--------------------------------------------------------- |