Skip to content

Commit

Permalink
passthrough: when enabled disable CUE/Play indicators
Browse files Browse the repository at this point in the history
  • Loading branch information
ronso0 committed Jun 12, 2022
1 parent dd7e646 commit f58a2ed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/engine/controls/cuecontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,6 @@ void CueControl::cuePlay(double value) {
// If not freely playing (i.e. stopped or platter IS being touched), press to go to cue and stop.
// On release, start playing from cue point.


QMutexLocker lock(&m_mutex);
const auto freely_playing = m_pPlay->toBool() && !getEngineBuffer()->getScratching();
TrackAt trackAt = getTrackAt();
Expand Down Expand Up @@ -2030,6 +2029,7 @@ void HotcueControl::setCue(const CuePointer& pCue) {
// because we have a null check for valid data else where in the code
m_pCue = pCue;
}

mixxx::RgbColor::optional_t HotcueControl::getColor() const {
return doubleToRgbColor(m_hotcueColor->get());
}
Expand All @@ -2039,6 +2039,7 @@ void HotcueControl::setColor(mixxx::RgbColor::optional_t newColor) {
m_hotcueColor->set(*newColor);
}
}

void HotcueControl::resetCue() {
// clear pCue first because we have a null check for valid data else where
// in the code
Expand Down
6 changes: 6 additions & 0 deletions src/engine/enginebuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,12 @@ void EngineBuffer::slotPassthroughChanged(double enabled) {
if (enabled > 0) {
// If passthrough was enabled, stop playing the current track.
slotControlStop(1.0);
// Disable CUE and Play indicators
m_pCueControl->resetIndicators();
} else {
// Update CUE and Play indicators. Note: m_pCueControl->updateIndicators()
// is not sufficient.
updateIndicatorsAndModifyPlay(false, false);
}
}

Expand Down

0 comments on commit f58a2ed

Please sign in to comment.