diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-08-18 22:38:54 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-08-18 22:38:54 +0200 |
| commit | 2c7e2c6dc7175d572a4176c63c134ef85adb7376 (patch) | |
| tree | 779d0125c5dd3d930966b429ed41194e7f64e259 /src/vinylcontrol | |
| parent | 7704fb71a884f4c3e70d8efdf0861975aaa26382 (diff) | |
| parent | 6962ce11f2451dc6c73ddfe24247e79e6132108a (diff) | |
Merge remote-tracking branch 'upstream/master' into rate_ratio
Diffstat (limited to 'src/vinylcontrol')
| -rw-r--r-- | src/vinylcontrol/defs_vinylcontrol.h | 2 | ||||
| -rw-r--r-- | src/vinylcontrol/vinylcontrolmanager.cpp | 15 | ||||
| -rw-r--r-- | src/vinylcontrol/vinylcontrolprocessor.cpp | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/vinylcontrol/defs_vinylcontrol.h b/src/vinylcontrol/defs_vinylcontrol.h index a7ac38fc69..aa37b7b04b 100644 --- a/src/vinylcontrol/defs_vinylcontrol.h +++ b/src/vinylcontrol/defs_vinylcontrol.h @@ -29,7 +29,7 @@ const int VINYL_STATUS_ERROR = 3; #define MIXXX_VINYL_SPEED_33 "33.3 RPM" #define MIXXX_VINYL_SPEED_45 "45 RPM" -#define MIXXX_VINYL_SPEED_33_NUM 33.3 +#define MIXXX_VINYL_SPEED_33_NUM (100.0 / 3.0) #define MIXXX_VINYL_SPEED_45_NUM 45.0 #define MIXXX_VCMODE_ABSOLUTE 0 diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp index d438a510ef..cbb337c8ab 100644 --- a/src/vinylcontrol/vinylcontrolmanager.cpp +++ b/src/vinylcontrol/vinylcontrolmanager.cpp @@ -4,18 +4,19 @@ * @date April 15, 2011 */ +#include "vinylcontrol/vinylcontrolmanager.h" + #include "control/controlobject.h" #include "control/controlproxy.h" #include "mixer/playermanager.h" #include "soundio/soundmanager.h" +#include "util/compatibility.h" #include "util/timer.h" #include "vinylcontrol/defs_vinylcontrol.h" #include "vinylcontrol/vinylcontrol.h" #include "vinylcontrol/vinylcontrolprocessor.h" #include "vinylcontrol/vinylcontrolxwax.h" -#include "vinylcontrol/vinylcontrolmanager.h" - VinylControlManager::VinylControlManager(QObject* pParent, UserSettingsPointer pConfig, SoundManager* pSoundManager) @@ -23,7 +24,7 @@ VinylControlManager::VinylControlManager(QObject* pParent, m_pConfig(pConfig), m_pProcessor(new VinylControlProcessor(this, pConfig)), m_iTimerId(-1), - m_pNumDecks(NULL), + m_pNumDecks(nullptr), m_iNumConfiguredDecks(0) { // Register every possible VC input with SoundManager to route to the // VinylControlProcessor. @@ -32,8 +33,10 @@ VinylControlManager::VinylControlManager(QObject* pParent, AudioInput(AudioInput::VINYLCONTROL, 0, 2, i), m_pProcessor); } - connect(&m_vinylControlEnabledMapper, SIGNAL(mapped(int)), - this, SLOT(slotVinylControlEnabledChanged(int))); + connect(&m_vinylControlEnabledMapper, + QOverload<int>::of(&QSignalMapper::mapped), + this, + &VinylControlManager::slotVinylControlEnabledChanged); } VinylControlManager::~VinylControlManager() { @@ -124,7 +127,7 @@ bool VinylControlManager::vinylInputConnected(int deck) { return false; } if (deck < 0 || deck >= m_pVcEnabled.length()) { - qDebug() << "WARNING, tried to get vinyl enabled status for non-existant deck " << deck; + qDebug() << "WARNING, tried to get vinyl enabled status for non-existent deck " << deck; return false; } return m_pProcessor->deckConfigured(deck); diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp index 1dd7d71727..5db2f0d55e 100644 --- a/src/vinylcontrol/vinylcontrolprocessor.cpp +++ b/src/vinylcontrol/vinylcontrolprocessor.cpp @@ -25,8 +25,10 @@ VinylControlProcessor::VinylControlProcessor(QObject* pParent, UserSettingsPoint m_bReportSignalQuality(false), m_bQuit(false), m_bReloadConfig(false) { - connect(m_pToggle, SIGNAL(valueChanged(double)), - this, SLOT(toggleDeck(double)), + connect(m_pToggle, + &ControlPushButton::valueChanged, + this, + &VinylControlProcessor::toggleDeck, Qt::DirectConnection); for (int i = 0; i < kMaximumVinylControlInputs; ++i) { |