diff options
Diffstat (limited to 'muse2/muse/widgets/meter.cpp')
| -rw-r--r-- | muse2/muse/widgets/meter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/muse2/muse/widgets/meter.cpp b/muse2/muse/widgets/meter.cpp index 590e7f65..5c79ffb2 100644 --- a/muse2/muse/widgets/meter.cpp +++ b/muse2/muse/widgets/meter.cpp @@ -38,7 +38,7 @@ // Just an experiment. Some undesirable effects, see below... //#define _USE_CLIPPER 1 -namespace MusEWidget { +namespace MusEGui { //--------------------------------------------------------- // Meter @@ -63,7 +63,7 @@ Meter::Meter(QWidget* parent, MeterType type) last_ymax = 0; val = 0.0; maxVal = 0.0; - minScale = mtype == DBMeter ? MusEConfig::config.minMeter : 0.0; // min value in dB or int + minScale = mtype == DBMeter ? MusEGlobal::config.minMeter : 0.0; // min value in dB or int maxScale = mtype == DBMeter ? 10.0 : 127.0; yellowScale = -10; redScale = 0; @@ -164,7 +164,7 @@ void Meter::setVal(double v, double max, bool ovl) { maxVal = max; if(mtype == DBMeter) - cur_ymax = maxVal == 0 ? fw : int(((maxScale - (fast_log10(maxVal) * 20.0)) * h)/range); + cur_ymax = maxVal == 0 ? fw : int(((maxScale - (MusECore::fast_log10(maxVal) * 20.0)) * h)/range); else cur_ymax = maxVal == 0 ? fw : int(((maxScale - maxVal) * h)/range); if(cur_ymax > h) cur_ymax = h; @@ -179,7 +179,7 @@ void Meter::setVal(double v, double max, bool ovl) if(ud) { if(mtype == DBMeter) - cur_yv = val == 0 ? h : int(((maxScale - (fast_log10(val) * 20.0)) * h)/range); + cur_yv = val == 0 ? h : int(((maxScale - (MusECore::fast_log10(val) * 20.0)) * h)/range); else cur_yv = val == 0 ? h : int(((maxScale - val) * h)/range); if(cur_yv > h) cur_yv = h; @@ -247,8 +247,8 @@ void Meter::paintEvent(QPaintEvent* ev) { if(mtype == DBMeter) { - cur_yv = val == 0 ? h : int(((maxScale - (fast_log10(val) * 20.0)) * h)/range); - cur_ymax = maxVal == 0 ? fw : int(((maxScale - (fast_log10(maxVal) * 20.0)) * h)/range); + cur_yv = val == 0 ? h : int(((maxScale - (MusECore::fast_log10(val) * 20.0)) * h)/range); + cur_ymax = maxVal == 0 ? fw : int(((maxScale - (MusECore::fast_log10(maxVal) * 20.0)) * h)/range); } else { @@ -547,4 +547,4 @@ void Meter::mousePressEvent(QMouseEvent*) emit mousePress(); } -} // namespace MusEWidget +} // namespace MusEGui |