From f9b78052aaaf5f9eee674291559fc9a2b67aa0d0 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Wed, 29 Jun 2022 22:55:08 +0200 Subject: [PATCH] restore 'Reset EQs on track load' --- src/mixer/basetrackplayer.h | 3 ++- src/mixer/playermanager.cpp | 3 +++ src/test/autodjprocessor_test.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h index fc557a41c889..ba7b5ddcdf38 100644 --- a/src/mixer/basetrackplayer.h +++ b/src/mixer/basetrackplayer.h @@ -36,6 +36,7 @@ class BaseTrackPlayer : public BasePlayer { ~BaseTrackPlayer() override = default; virtual TrackPointer getLoadedTrack() const = 0; + virtual void setupEqControls() = 0; public slots: virtual void slotLoadTrack(TrackPointer pTrack, bool bPlay = false) = 0; @@ -71,7 +72,7 @@ class BaseTrackPlayerImpl : public BaseTrackPlayer { // connected. Delete me when EngineMaster supports AudioInput assigning. EngineDeck* getEngineDeck() const; - void setupEqControls(); + void setupEqControls() final; // For testing, loads a fake track. TrackPointer loadFakeTrack(bool bPlay, double filebpm); diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 0f018bd0e4e0..40b741ba8601 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -437,6 +437,9 @@ void PlayerManager::addDeckInner() { // Setup equalizer and QuickEffect chain for this deck. m_pEffectsManager->addDeck(handleGroup.m_name); + + // Setup EQ ControlProxies used for resetting EQs on track load + pDeck->setupEqControls(); } void PlayerManager::loadSamplers() { diff --git a/src/test/autodjprocessor_test.cpp b/src/test/autodjprocessor_test.cpp index 25100d5d6850..debee56a448d 100644 --- a/src/test/autodjprocessor_test.cpp +++ b/src/test/autodjprocessor_test.cpp @@ -83,6 +83,8 @@ class FakeDeck : public BaseTrackPlayer { return loadedTrack; } + void setupEqControls() override{}; + // This method emulates requesting a track load to a player and emits no // signals. Normally, the reader thread attempts to load the file and emits // a success or failure signal. To simulate a load success, call