diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
| commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
| tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/ctrl.cpp | |
| parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) | |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/ctrl.cpp')
| -rw-r--r-- | muse2/muse/ctrl.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/muse2/muse/ctrl.cpp b/muse2/muse/ctrl.cpp index 3779682d..bc4ce246 100644 --- a/muse2/muse/ctrl.cpp +++ b/muse2/muse/ctrl.cpp @@ -37,6 +37,8 @@ #include "xml.h" #include "audio.h" +namespace MusECore { + void CtrlList::initColor(int i) { QColor collist[] = { Qt::red, Qt::yellow, Qt::blue , Qt::black, Qt::white, Qt::green }; @@ -156,11 +158,11 @@ double CtrlList::value(int frame) const //printf("before val1=%f val2=%f\n", val1,val2); if (_valueType == VAL_LOG) { val1 = 20.0*fast_log10(val1); - if (val1 < MusEConfig::config.minSlider) - val1=MusEConfig::config.minSlider; + if (val1 < MusEGlobal::config.minSlider) + val1=MusEGlobal::config.minSlider; val2 = 20.0*fast_log10(val2); - if (val2 < MusEConfig::config.minSlider) - val2=MusEConfig::config.minSlider; + if (val2 < MusEGlobal::config.minSlider) + val2=MusEGlobal::config.minSlider; } //printf("after val1=%f val2=%f\n", val1,val2); frame -= frame1; @@ -395,3 +397,4 @@ void CtrlListList::add(CtrlList* vl) insert(std::pair<const int, CtrlList*>(vl->id(), vl)); } +} // namespace MusECore |