diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-03 01:06:41 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-03 01:06:41 +0100 |
commit | bed4a876d8f37ce11896b3b610f1a0acbe2ff0b9 (patch) | |
tree | 5b681eac047da2f665fa7d58799f53a3a49404e1 /src/mixer | |
parent | 4cd2942a20e31343dee81c719ea70b567a45d196 (diff) |
mixer: Connect noPassthroughInputConfigured directly via EngineDeck
Diffstat (limited to 'src/mixer')
-rw-r--r-- | src/mixer/basetrackplayer.cpp | 2 | ||||
-rw-r--r-- | src/mixer/basetrackplayer.h | 1 | ||||
-rw-r--r-- | src/mixer/playermanager.cpp | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index 364b1fa55d..791a2fc302 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -41,8 +41,6 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, pMixingEngine->registerChannelGroup(group); m_pChannel = new EngineDeck(channelGroup, pConfig, pMixingEngine, pEffectsManager, defaultOrientation); - connect(m_pChannel, &EngineDeck::noPassthroughInputConfigured, - [this]{ emit(noPassthroughInputConfigured()); }); m_pInputConfigured = std::make_unique<ControlProxy>(group, "input_configured", this); #ifdef __VINYLCONTROL__ diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h index cf49f23bc8..57a3c862fc 100644 --- a/src/mixer/basetrackplayer.h +++ b/src/mixer/basetrackplayer.h @@ -42,7 +42,6 @@ class BaseTrackPlayer : public BasePlayer { void newTrackLoaded(TrackPointer pLoadedTrack); void loadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack); void playerEmpty(); - void noPassthroughInputConfigured(); void noVinylControlInputConfigured(); }; diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 97c1aa55be..bf43a00e05 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -365,8 +365,8 @@ void PlayerManager::addDeckInner() { Deck* pDeck = new Deck(this, m_pConfig, m_pEngine, m_pEffectsManager, orientation, group); - connect(pDeck, SIGNAL(noPassthroughInputConfigured()), - this, SIGNAL(noDeckPassthroughInputConfigured())); + connect(pDeck->getEngineDeck(), &EngineDeck::noPassthroughInputConfigured, + this, &PlayerManager::noDeckPassthroughInputConfigured); connect(pDeck, SIGNAL(noVinylControlInputConfigured()), this, SIGNAL(noVinylControlInputConfigured())); |