Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/mixer/basetrackplayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/mixer/playermanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions src/test/autodjprocessor_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down