diff widgets/Fader.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch

--- a/widgets/Fader.cpp	Mon Dec 12 15:18:52 2016 +0000
+++ b/widgets/Fader.cpp	Mon Sep 17 13:51:31 2018 +0100
@@ -59,25 +59,25 @@
     QString background_path = ":/icons/fader_background.png";
     bool ok = m_back.load(background_path);
     if (ok == false) {
-	cerr << "Fader: Error loading pixmap" << endl;
+        cerr << "Fader: Error loading pixmap" << endl;
     }
 
     QString leds_path = ":/icons/fader_leds.png";
     ok = m_leds.load(leds_path);
     if (ok == false) {
-	cerr <<  "Error loading pixmap" << endl;
+        cerr <<  "Error loading pixmap" << endl;
     }
 
     QString knob_path = ":/icons/fader_knob.png";
     ok = m_knob.load(knob_path);
     if (ok == false) {
-	cerr <<  "Error loading pixmap" << endl;
+        cerr <<  "Error loading pixmap" << endl;
     }
 
     QString clip_path = ":/icons/fader_knob_red.png";
     ok = m_clip.load(clip_path);
     if (ok == false) {
-	cerr <<  "Error loading pixmap" << endl;
+        cerr <<  "Error loading pixmap" << endl;
     }
 }
 
@@ -111,7 +111,7 @@
     if (vx < 0) vx = 0;
 
     float fval = (float)AudioLevel::fader_to_multiplier
-	(vx, getMaxX(), AudioLevel::LongFader);
+        (vx, getMaxX(), AudioLevel::LongFader);
 
     setValue(fval);
     emit valueChanged(fval);
@@ -179,9 +179,9 @@
     //!!! needs improvement
 
     if (ev->delta() > 0) {
-	setValue(m_value * 1.f);
+        setValue(m_value * 1.f);
     } else {
-	setValue(m_value / 1.f);
+        setValue(m_value / 1.f);
     }
 
     update();
@@ -206,27 +206,27 @@
     float max = (float)AudioLevel::dB_to_multiplier(10.0);
 
     if (v > max) {
-	v = max;
+        v = max;
     } else if (v < 0.0) {
-	v = 0.0;
+        v = 0.0;
     }
 
     if (m_value != v) {
-	m_value = v;
-	float db = (float)AudioLevel::multiplier_to_dB(m_value);
+        m_value = v;
+        float db = (float)AudioLevel::multiplier_to_dB(m_value);
         QString text;
-	if (db <= AudioLevel::DB_FLOOR) {
+        if (db <= AudioLevel::DB_FLOOR) {
             text = tr("Level: Off");
-	} else {
+        } else {
             text = tr("Level: %1%2.%3%4 dB")
                 .arg(db < 0.0 ? "-" : "")
                 .arg(abs(int(db)))
                 .arg(abs(int(db * 10.0) % 10))
                 .arg(abs(int(db * 100.0) % 10));
-	}
+        }
         cerr << "Fader: setting tooltip to \"" << text << "\"" << endl;
         QWidget::setToolTip(text);
-	update();
+        update();
     }
 }
 
@@ -243,8 +243,8 @@
 Fader::setPeakLeft(float peak)
 {
     if (this->m_peakLeft != peak) {
-	this->m_peakLeft = peak;
-	update();
+        this->m_peakLeft = peak;
+        update();
     }
 }
 
@@ -253,8 +253,8 @@
 Fader::setPeakRight(float peak) 
 {
     if (this->m_peakRight != peak) {
-	this->m_peakRight = peak;
-	update();
+        this->m_peakRight = peak;
+        update();
     }
 }
 
@@ -268,30 +268,30 @@
     painter.drawPixmap(rect(), m_back, QRect(0, 0, 116, 23));
 
     int offset_L = AudioLevel::multiplier_to_fader(m_peakLeft, 116,
-						   AudioLevel::IEC268LongMeter);
+                                                   AudioLevel::IEC268LongMeter);
 
     painter.drawPixmap(QRect(0, 0, offset_L, 11), m_leds,
-		       QRect(0, 0, offset_L, 11));
+                       QRect(0, 0, offset_L, 11));
 
     int offset_R = AudioLevel::multiplier_to_fader(m_peakRight, 116,
-						   AudioLevel::IEC268LongMeter);
+                                                   AudioLevel::IEC268LongMeter);
 
     painter.drawPixmap(QRect(0, 11, offset_R, 11), m_leds,
-		       QRect(0, 11, offset_R, 11));
+                       QRect(0, 11, offset_R, 11));
 
     if (m_withoutKnob == false) {
 
-	static const uint knob_width = 29;
-	static const uint knob_height = 9;
+        static const uint knob_width = 29;
+        static const uint knob_height = 9;
 
-	int x = AudioLevel::multiplier_to_fader(m_value, 116 - knob_width,
-						AudioLevel::LongFader);
+        int x = AudioLevel::multiplier_to_fader(m_value, 116 - knob_width,
+                                                AudioLevel::LongFader);
 
-	bool clipping = (m_peakLeft > 1.0 || m_peakRight > 1.0);
+        bool clipping = (m_peakLeft > 1.0 || m_peakRight > 1.0);
 
-	painter.drawPixmap(QRect(x, 7, knob_width, knob_height),
-			   clipping ? m_clip : m_knob,
-			   QRect(0, 0, knob_width, knob_height));
+        painter.drawPixmap(QRect(x, 7, knob_width, knob_height),
+                           clipping ? m_clip : m_knob,
+                           QRect(0, 0, knob_width, knob_height));
     }
 }