From bed4a876d8f37ce11896b3b610f1a0acbe2ff0b9 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Mon, 3 Feb 2020 01:06:41 +0100 Subject: mixer: Connect noPassthroughInputConfigured directly via EngineDeck --- src/mixer/basetrackplayer.cpp | 2 -- src/mixer/basetrackplayer.h | 1 - src/mixer/playermanager.cpp | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mixer') 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(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())); -- cgit v1.2.3