1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
|
Description: Fix errors related to the abs() function
Author: Philip Chung <philipchung1995@yahoo.com>
Bug-Debian: https://bugs.debian.org/831147
---
midiedit/ecanvas.cpp | 1 +
sync.cpp | 4 ++--
widgets/knob.cpp | 2 +-
widgets/knob_and_meter.cpp | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
--- muse.orig/muse/widgets/knob.cpp
+++ muse/muse/widgets/knob.cpp
@@ -172,7 +172,7 @@ void Knob::drawKnob(QPainter* p, const Q
QPen pn;
pn.setCapStyle(Qt::FlatCap);
- pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
+ pn.setColor(d_shinyColor.lighter(l_const + std::abs(value() * l_slope)));
pn.setWidth(d_shineWidth * 2);
p->setPen(pn);
p->drawArc(aRect, 0, 360 * 16);
--- muse.orig/muse/widgets/knob_and_meter.cpp
+++ muse/muse/widgets/knob_and_meter.cpp
@@ -171,7 +171,7 @@ void KnobWithMeter::drawKnob(QPainter* p
QPen pn;
pn.setCapStyle(Qt::FlatCap);
- pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
+ pn.setColor(d_shinyColor.lighter(l_const + std::abs(value() * l_slope)));
pn.setWidth(d_shineWidth * 2);
p->setPen(pn);
p->drawArc(aRect, 0, 360 * 16);
--- muse.orig/muse/midiedit/ecanvas.cpp
+++ muse/muse/midiedit/ecanvas.cpp
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <errno.h>
#include <limits.h>
+#include <math.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/mman.h>
--- muse.orig/muse/sync.cpp
+++ muse/muse/sync.cpp
@@ -961,7 +961,7 @@ void MidiSeq::realtimeSystemInput(int po
if(_preDetect && pole == 0)
{
double real_tempo = 60.0/(avg_diff * 24.0);
- double real_tempo_diff = abs(real_tempo - _lastRealTempo);
+ double real_tempo_diff = std::abs(real_tempo - _lastRealTempo);
// If the tempo changed a large amount, reset.
if(real_tempo_diff >= 10.0) // TODO: User-adjustable?
@@ -1009,7 +1009,7 @@ void MidiSeq::realtimeSystemInput(int po
if(pole == fin_idx)
{
double real_tempo = 60.0/(avg_diff * 24.0);
- double real_tempo_diff = abs(real_tempo - _lastRealTempo);
+ double real_tempo_diff = std::abs(real_tempo - _lastRealTempo);
if(real_tempo_diff >= _tempoQuantizeAmount/2.0) // Anti-hysteresis
{
|