diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2016-03-18 23:05:50 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2016-03-18 23:05:50 +0100 |
| commit | 42c72ba00bf7747a9a085e3eadcc3896365c87ac (patch) | |
| tree | 7b16127a7ccdbf56cc49d87c0902816ad2041421 /src/engine/cuecontrol.h | |
| parent | faa2166347cf46c719045c38a189727dd2c10dd6 (diff) | |
| parent | 94e9c0c93d985119ffb6403d774882c02c4ce6a4 (diff) | |
Merge remote-tracking branch 'upstream/master' into replaygain2
Conflicts:
src/engine/sidechain/engineshoutcast.cpp
Diffstat (limited to 'src/engine/cuecontrol.h')
| -rw-r--r-- | src/engine/cuecontrol.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/cuecontrol.h b/src/engine/cuecontrol.h index 75a6920ba3..800e3a9a51 100644 --- a/src/engine/cuecontrol.h +++ b/src/engine/cuecontrol.h @@ -94,8 +94,7 @@ class CueControl : public EngineControl { bool getPlayFlashingAtPause(); public slots: - void trackLoaded(TrackPointer pTrack); - void trackUnloaded(TrackPointer pTrack); + void trackLoaded(TrackPointer pNewTrack, TrackPointer pOldTrack) override; private slots: void cueUpdated(); |