aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/eqpreset.cpp8
-rw-r--r--src/ui/eqpreset.h12
-rw-r--r--src/ui/eqslider.cpp12
-rw-r--r--src/ui/eqslider.h12
-rw-r--r--src/ui/eqwidget.cpp20
-rw-r--r--src/ui/eqwidget.h4
-rw-r--r--src/ui/mainwindow.cpp2
7 files changed, 35 insertions, 35 deletions
diff --git a/src/ui/eqpreset.cpp b/src/ui/eqpreset.cpp
index 760dea9d2..533dd4f67 100644
--- a/src/ui/eqpreset.cpp
+++ b/src/ui/eqpreset.cpp
@@ -31,26 +31,26 @@ EQPreset::EQPreset()
EQPreset::~EQPreset()
{}
-void EQPreset::setGain(int n, int value)
+void EQPreset::setGain(int n, double value)
{
if(n > 9 || n < 0)
return;
m_bands[n] = value;
}
-void EQPreset::setPreamp(int preamp)
+void EQPreset::setPreamp(double preamp)
{
m_preamp = preamp;
}
-int EQPreset::gain(int n)
+double EQPreset::gain(int n)
{
if(n > 9 || n < 0)
return 0;
return m_bands[n];
}
-int EQPreset::preamp()
+double EQPreset::preamp()
{
return m_preamp;
}
diff --git a/src/ui/eqpreset.h b/src/ui/eqpreset.h
index 80f31747e..fd99e6826 100644
--- a/src/ui/eqpreset.h
+++ b/src/ui/eqpreset.h
@@ -32,15 +32,15 @@ public:
~EQPreset();
- void setGain(int n, int value);
- void setPreamp(int);
+ void setGain(int n, double value);
+ void setPreamp(double);
- int gain(int n);
- int preamp();
+ double gain(int n);
+ double preamp();
private:
- int m_bands[10];
- int m_preamp;
+ double m_bands[10];
+ double m_preamp;
};
diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp
index bdc4ec4e2..5c08c71e3 100644
--- a/src/ui/eqslider.cpp
+++ b/src/ui/eqslider.cpp
@@ -94,12 +94,12 @@ void EqSlider::mouseMoveEvent(QMouseEvent* e)
}
}
-int EqSlider::value()
+double EqSlider::value()
{
- return -m_value;
+ return - m_value;
}
-void EqSlider::setValue(int p)
+void EqSlider::setValue(double p)
{
if (m_moving)
return;
@@ -107,7 +107,7 @@ void EqSlider::setValue(int p)
draw(FALSE);
}
-void EqSlider::setMax(int m)
+void EqSlider::setMax(double m)
{
m_max = m;
draw(FALSE);
@@ -131,9 +131,9 @@ void EqSlider::draw(bool pressed)
m_pos = p;
}
-int EqSlider::convert(int p)
+double EqSlider::convert(int p)
{
- return int(ceil(double(m_max-m_min)*(p)/(height()-12)+m_min));
+ return (m_max - m_min)*(p)/(height() - 12) + m_min;
}
void EqSlider::wheelEvent(QWheelEvent *e)
diff --git a/src/ui/eqslider.h b/src/ui/eqslider.h
index 54dc9f285..3915ec05b 100644
--- a/src/ui/eqslider.h
+++ b/src/ui/eqslider.h
@@ -38,14 +38,14 @@ public:
~EqSlider();
- int value();
+ double value();
public slots:
- void setValue(int);
- void setMax(int);
+ void setValue(double);
+ void setMax(double);
signals:
- void sliderMoved (int);
+ void sliderMoved (double);
private slots:
void updateSkin();
@@ -54,9 +54,9 @@ private:
Skin *m_skin;
bool m_moving;
int press_pos;
- int m_max, m_min, m_pos, m_value, m_old;
+ double m_max, m_min, m_pos, m_value, m_old;
QPixmap m_pixmap;
- int convert(int); // value = convert(position);
+ double convert(int); // value = convert(position);
void draw(bool pressed = TRUE);
protected:
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index 457bfd5e0..860830146 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -54,7 +54,7 @@ EqWidget::EqWidget (QWidget *parent)
m_preamp = new EqSlider (this);
m_preamp->show();
m_preamp->move (21,38);
- connect (m_preamp,SIGNAL (sliderMoved (int)),SLOT (setPreamp ()));
+ connect (m_preamp,SIGNAL (sliderMoved (double)),SLOT (setPreamp ()));
m_on = new ToggleButton (this,Skin::EQ_BT_ON_N,Skin::EQ_BT_ON_P,
Skin::EQ_BT_OFF_N,Skin::EQ_BT_OFF_P);
@@ -83,7 +83,7 @@ EqWidget::EqWidget (QWidget *parent)
m_sliders << new EqSlider (this);
m_sliders.at (i)->move (78+i*18,38);
m_sliders.at (i)->show();
- connect (m_sliders.at (i), SIGNAL (sliderMoved (int)),SLOT (setGain()));
+ connect (m_sliders.at (i), SIGNAL (sliderMoved (double)),SLOT (setGain()));
}
readSettings();
createActions();
@@ -98,12 +98,12 @@ EqWidget::~EqWidget()
delete m_autoPresets.takeFirst();
}
-int EqWidget::preamp()
+double EqWidget::preamp()
{
return m_preamp->value();
}
-int EqWidget::gain (int g)
+double EqWidget::gain (int g)
{
return m_sliders.at (g)->value();
}
@@ -138,8 +138,8 @@ void EqWidget::readSettings()
//equalizer
for (int i = 0; i < m_sliders.size(); ++i)
m_sliders.at(i)->setValue(settings.value("band_"+
- QString("%1").arg(i), 0).toInt());
- m_preamp->setValue(settings.value("preamp", 0).toInt());
+ QString("%1").arg(i), 0).toDouble());
+ m_preamp->setValue(settings.value("preamp", 0).toDouble());
m_on->setON(settings.value("enabled", FALSE).toBool());
settings.endGroup();
setGain();
@@ -157,9 +157,9 @@ void EqWidget::readSettings()
for (int j = 0; j < 10; ++j)
{
preset->setGain(j,eq_preset.value("Band"+QString("%1").arg(j),
- 0).toInt());
+ 0).toDouble());
}
- preset->setPreamp(eq_preset.value("Preamp",0).toInt());
+ preset->setPreamp(eq_preset.value("Preamp",0).toDouble());
m_presets.append(preset);
eq_preset.endGroup();
}
@@ -180,9 +180,9 @@ void EqWidget::readSettings()
for (int j = 0; j < 10; ++j)
{
preset->setGain(j,eq_auto.value("Band"+QString("%1").arg(j),
- 0).toInt());
+ 0).toDouble());
}
- preset->setPreamp(eq_auto.value("Preamp",0).toInt());
+ preset->setPreamp(eq_auto.value("Preamp",0).toDouble());
m_autoPresets.append(preset);
eq_auto.endGroup();
}
diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h
index 7e30eec86..da79c3073 100644
--- a/src/ui/eqwidget.h
+++ b/src/ui/eqwidget.h
@@ -46,8 +46,8 @@ public:
~EqWidget();
- int preamp();
- int gain(int);
+ double preamp();
+ double gain(int);
bool isEQEnabled();
/*!
* necessary for auto-load presets
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index ec2ebbb1b..d9a45249d 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -212,7 +212,7 @@ void MainWindow::previous()
void MainWindow::updateEQ()
{
- int b[10];
+ double b[10];
for (int i=0; i<10; ++i)
b[i] = m_equalizer->gain(i);
m_core->setEQ(b, m_equalizer->preamp());
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 04:20:20 +0000