diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
| commit | a347445db32f51562aee5c6a786c312d1f612d2f (patch) | |
| tree | ba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/muse/widgets/poslabel.cpp | |
| parent | 375d6a53630f364c6560eb40255a8cc4c0496b8c (diff) | |
| parent | 5367067f7a36dce8a362dcc000d41ac581bffdfe (diff) | |
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/muse/widgets/poslabel.cpp')
| -rw-r--r-- | muse2/muse/widgets/poslabel.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index 98a7eba3..6cdcb27e 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -33,9 +33,11 @@ #include "tempo.h" #include "globals.h" +namespace MusEGlobal { extern int mtcType; +} -namespace MusEWidget { +namespace MusEGui { //--------------------------------------------------------- // PosLabel @@ -87,7 +89,7 @@ void PosLabel::updateValue() int min = int(time) / 60; int sec = int(time) % 60; double rest = time - (min * 60 + sec); - switch(mtcType) { + switch(MusEGlobal::mtcType) { case 0: // 24 frames sec rest *= 24; break; @@ -165,10 +167,10 @@ void PosLabel::setSmpte(bool val) { _smpte = val; if (val) - _sampleValue = tempomap.tick2frame(_tickValue); + _sampleValue = MusEGlobal::tempomap.tick2frame(_tickValue); else - _tickValue = tempomap.frame2tick(_sampleValue); + _tickValue = MusEGlobal::tempomap.frame2tick(_sampleValue); updateValue(); } -} // namespace MusEWidget +} // namespace MusEGui |