Multi Preview Fix #3382
Multi Preview Fix #3382
Conversation
|
You might consider to pick and apply this commit: uklotzde@4c2d90f I didn't check if it still applies here and what changes are required. The idea is simple, just keep the code that belongs together at a single place. |
…consitent transition between loop cues and hot cues.
daschuer
force-pushed
the
hotcue_focus_off_by_one_main
branch
from
2138112
to
9f1b93c
Compare
|
Done. |
src/engine/controls/cuecontrol.cpp
Outdated
| @@ -30,6 +30,8 @@ constexpr double CUE_MODE_CUP = 5.0; | |||
| /// This is the position of a fresh loaded tack without any seek | |||
| constexpr double kDefaultLoadPosition = 0.0; | |||
| constexpr int kNoHotCueNumber = 0; | |||
| /// Used for a common tarcking of the previewing Hotcue in m_currentlyPreviewingIndex | |||
src/engine/controls/cuecontrol.cpp
Outdated
| @@ -416,10 +416,16 @@ void CueControl::detachCue(HotcueControl* pControl) { | |||
| pControl->resetCue(); | |||
| } | |||
|
|
|||
| // This is called from the EngineWokerThread and ends with the initial seek v | |||
There was a problem hiding this comment.
typo and left over character
src/engine/controls/cuecontrol.cpp
Outdated
| @@ -617,6 +596,14 @@ void CueControl::loadCuesFromTrack() { | |||
| } | |||
| } | |||
|
|
|||
| // Detach all hotcues that are no longer present | |||
| for (int hotCue = 0; hotCue < m_iNumHotCues; ++hotCue) { | |||
| if (!active_hotcues.contains(hotCue)) { | |||
There was a problem hiding this comment.
Fix the variable naming along the way?
src/engine/controls/cuecontrol.cpp
Outdated
| // Seek to cue point | ||
| double cuePoint = m_pCuePoint->get(); | ||
|
|
||
| // Note: We do not mess with ply here, we continue playing or previewing. |
src/engine/controls/cuecontrol.cpp
Outdated
| @@ -1640,14 +1519,20 @@ void CueControl::introEndSet(double value) { | |||
| TrackPointer pLoadedTrack = m_pLoadedTrack; | |||
| lock.unlock(); | |||
|
|
|||
| // Update Track's cue. | |||
| // CO's are update loadCuesFromTrack() | |||
There was a problem hiding this comment.
missing "in" (multiple times)
src/engine/controls/cuecontrol.h
Outdated
| } | ||
| void setPreviewingPosition(double position) { | ||
| m_previewingPosition = position; | ||
| void storePreviewingActivateData() { |
There was a problem hiding this comment.
The name of the function does not tell me what it is actually doing. What is "activate data"?
| pCue->setStartPosition(startPosition); | ||
| if (endPosition == Cue::kNoPosition) { | ||
| pCue->setType(mixxx::CueType::HotCue); | ||
| if (!pCue) { |
There was a problem hiding this comment.
if (pCue) { update } else { create }
src/mixer/basetrackplayer.cpp
Outdated
| @@ -327,11 +327,14 @@ TrackPointer BaseTrackPlayerImpl::unloadTrack() { | |||
| } | |||
| } | |||
| if (!pLoopCue) { | |||
There was a problem hiding this comment.
if (pLoopCue) { update } else { create }
src/track/track.cpp
Outdated
| mixxx::CueType type, | ||
| int hotCueIndex, | ||
| double sampleStartPosition, | ||
| double sampleEndPosition) { | ||
| QMutexLocker lock(&m_qMutex); |
There was a problem hiding this comment.
Move the lock down to the point when it is actually needed. We don't need to protect the global system allocator or the Qt connect functions.
|
To clarify, this fixes a regression in the main branch, correct? If so, it's not relevant for 2.3. |
|
Yes, merge target main is correct. |
|
Done |
|
@uklotzde Is this OK now? |
This fixes an issue when you preview more than one cues at a time.
In 2.3 the last released button moves the playposition to the associated hot cue position.
This can't no longer work with cue loops involved.
I have changed the code that internally only one hot cue can be previewing.
If you preview one hot-cue and press a second one, the second takes over. The release of the first hot cue is ignored from that point. If it was a loop, looping is disabled.
This also cleans up looking.