summaryrefslogtreecommitdiffstats
path: root/src/preferences
diff options
context:
space:
mode:
Diffstat (limited to 'src/preferences')
-rw-r--r--src/preferences/dialog/dlgprefbroadcast.cpp4
-rw-r--r--src/preferences/dialog/dlgprefdeck.cpp4
-rw-r--r--src/preferences/dialog/dlgprefeq.cpp2
-rw-r--r--src/preferences/dialog/dlgprefsound.cpp8
-rw-r--r--src/preferences/dialog/dlgprefvinyl.cpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/preferences/dialog/dlgprefbroadcast.cpp b/src/preferences/dialog/dlgprefbroadcast.cpp
index bf4db034ce..9885108732 100644
--- a/src/preferences/dialog/dlgprefbroadcast.cpp
+++ b/src/preferences/dialog/dlgprefbroadcast.cpp
@@ -89,8 +89,8 @@ DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent,
m_pBroadcastEnabled = new ControlProxy(
BROADCAST_PREF_KEY, "enabled", this);
- m_pBroadcastEnabled->connectValueChanged(
- SLOT(broadcastEnabledChanged(double)));
+ m_pBroadcastEnabled->connectValueChanged(this,
+ &DlgPrefBroadcast::broadcastEnabledChanged);
//Server type combobox
comboBoxServerType->addItem(tr("Icecast 2"), BROADCAST_SERVER_ICECAST2);
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index 0f73b68f3c..fb2059eb47 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -43,11 +43,11 @@ DlgPrefDeck::DlgPrefDeck(QWidget * parent, MixxxMainWindow * mixxx,
setupUi(this);
m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
- m_pNumDecks->connectValueChanged(SLOT(slotNumDecksChanged(double)));
+ m_pNumDecks->connectValueChanged(this, [=](double value){slotNumDecksChanged(value);});
slotNumDecksChanged(m_pNumDecks->get(), true);
m_pNumSamplers = new ControlProxy("[Master]", "num_samplers", this);
- m_pNumSamplers->connectValueChanged(SLOT(slotNumSamplersChanged(double)));
+ m_pNumSamplers->connectValueChanged(this, [=](double value){slotNumSamplersChanged(value);});
slotNumSamplersChanged(m_pNumSamplers->get(), true);
// Set default value in config file and control objects, if not present
diff --git a/src/preferences/dialog/dlgprefeq.cpp b/src/preferences/dialog/dlgprefeq.cpp
index 2ea1dc9f21..90edfaac20 100644
--- a/src/preferences/dialog/dlgprefeq.cpp
+++ b/src/preferences/dialog/dlgprefeq.cpp
@@ -82,7 +82,7 @@ DlgPrefEQ::DlgPrefEQ(QWidget* pParent, EffectsManager* pEffectsManager,
// Add drop down lists for current decks and connect num_decks control
// to slotNumDecksChanged
m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
- m_pNumDecks->connectValueChanged(SLOT(slotNumDecksChanged(double)));
+ m_pNumDecks->connectValueChanged(this, &DlgPrefEQ::slotNumDecksChanged);
slotNumDecksChanged(m_pNumDecks->get());
setUpMasterEQ();
diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index e20a567dc0..27771382de 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -152,10 +152,10 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, SoundManager* pSoundManager,
m_pMasterAudioLatencyOverloadCount =
new ControlProxy("[Master]", "audio_latency_overload_count", this);
- m_pMasterAudioLatencyOverloadCount->connectValueChanged(SLOT(bufferUnderflow(double)));
+ m_pMasterAudioLatencyOverloadCount->connectValueChanged(this, &DlgPrefSound::bufferUnderflow);
m_pMasterLatency = new ControlProxy("[Master]", "latency", this);
- m_pMasterLatency->connectValueChanged(SLOT(masterLatencyChanged(double)));
+ m_pMasterLatency->connectValueChanged(this, &DlgPrefSound::masterLatencyChanged);
// TODO: remove this option by automatically disabling/enabling the master mix
// when recording, broadcasting, headphone, and master outputs are enabled/disabled
@@ -165,7 +165,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, SoundManager* pSoundManager,
masterMixComboBox->setCurrentIndex(m_pMasterEnabled->get() ? 1 : 0);
connect(masterMixComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(masterMixChanged(int)));
- m_pMasterEnabled->connectValueChanged(SLOT(masterEnabledChanged(double)));
+ m_pMasterEnabled->connectValueChanged(this, &DlgPrefSound::masterEnabledChanged);
m_pMasterMonoMixdown = new ControlProxy("[Master]", "mono_mixdown", this);
masterOutputModeComboBox->addItem(tr("Stereo"));
@@ -173,7 +173,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent, SoundManager* pSoundManager,
masterOutputModeComboBox->setCurrentIndex(m_pMasterMonoMixdown->get() ? 1 : 0);
connect(masterOutputModeComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(masterOutputModeComboBoxChanged(int)));
- m_pMasterMonoMixdown->connectValueChanged(SLOT(masterMonoMixdownChanged(double)));
+ m_pMasterMonoMixdown->connectValueChanged(this, &DlgPrefSound::masterMonoMixdownChanged);
m_pKeylockEngine =
new ControlProxy("[Master]", "keylock_engine", this);
diff --git a/src/preferences/dialog/dlgprefvinyl.cpp b/src/preferences/dialog/dlgprefvinyl.cpp
index 333ddcbbf4..1dc828c958 100644
--- a/src/preferences/dialog/dlgprefvinyl.cpp
+++ b/src/preferences/dialog/dlgprefvinyl.cpp
@@ -35,7 +35,7 @@ DlgPrefVinyl::DlgPrefVinyl(QWidget * parent, VinylControlManager *pVCMan,
m_pVCManager(pVCMan),
config(_config) {
m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
- m_pNumDecks->connectValueChanged(SLOT(slotNumDecksChanged(double)));
+ m_pNumDecks->connectValueChanged(this, &DlgPrefVinyl::slotNumDecksChanged);
setupUi(this);