Skip to content

AutoDJProcessorTest.FadeToDeck2_Long_Transition fix #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Be-ing merged 19 commits into from
Nov 7, 2019
Merged

AutoDJProcessorTest.FadeToDeck2_Long_Transition fix #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c1010a6
make emitLoadTrackToPlayer and emitAutoDJStateChanged a protected non…
daschuer Oct 27, 2019
cf658a9
move no outro start fallback code into getOutroStartPosition()
daschuer Oct 27, 2019
df29633
consider current position of the from deck after chaning the transiti…
daschuer Oct 27, 2019
2b1f525
fix AutoDJProcessorTest.FadeToDeck2_Long_Transition test. This fixes …
daschuer Oct 27, 2019
5e6988e
Cache hasFadeTransition before possible override
daschuer Oct 28, 2019
74fdcb8
Adjust FadeToDeck2_Pause_Transition for no fading transitions
daschuer Oct 28, 2019
277f5da
improve comments
daschuer Oct 28, 2019
96a5a45
improve error handing in case of -1 cue positions.
daschuer Oct 28, 2019
873e313
improve crossfaderChanged()
daschuer Oct 29, 2019
d6e6cf4
Adjust short track workaround in outro start mode
daschuer Oct 30, 2019
70214df
Adjust intro and outro change slots
daschuer Oct 30, 2019
e1c45e5
don't bother with playing state when calculating a new transition
daschuer Oct 30, 2019
6dac3a6
Don't use non cons references in playerPositionChanged() and remove f…
daschuer Oct 31, 2019
fd36927
Don't use non const references in toggleAutoDJ()
daschuer Oct 31, 2019
2f88f54
Reset startPos, just in case calculateTransition() is not able to set…
daschuer Oct 31, 2019
7036b74
Set the just loaded deck as toDeck
daschuer Nov 3, 2019
9951daa
respect the rate slider when calculating auto-DJ transitions
daschuer Nov 4, 2019
db49654
Whatch rate changes
daschuer Nov 4, 2019
efa6c00
fix recursive positionChanged call. Fix omitting fist seek.
daschuer Nov 7, 2019
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
25 changes: 5 additions & 20 deletions src/engine/enginebuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "engine/enginebuffer.h"

#include <cfloat>

#include <QtDebug>

#include "engine/cachingreader/cachingreader.h"
Expand Down Expand Up @@ -62,7 +64,7 @@ EngineBuffer::EngineBuffer(const QString& group, UserSettingsPointer pConfig,
m_pKeyControl(nullptr),
m_pReadAheadManager(nullptr),
m_pReader(nullptr),
m_filepos_play(0.),
m_filepos_play(DBL_MIN),
m_speed_old(0),
m_tempo_ratio_old(1.),
m_scratching_old(false),
Expand Down Expand Up @@ -502,6 +504,7 @@ void EngineBuffer::slotTrackLoaded(TrackPointer pTrack,

m_pause.lock();
m_visualPlayPos->setInvalid();
m_filepos_play = DBL_MIN; // for execute seeks to 0.0
m_pCurrentTrack = pTrack;
m_pTrackSamples->set(iTrackNumSamples);
m_pTrackSampleRate->set(iTrackSampleRate);
Expand Down Expand Up @@ -552,7 +555,7 @@ void EngineBuffer::ejectTrack() {
m_playButton->set(0.0);
m_playposSlider->set(0);
m_pCueControl->resetIndicators();
doSeekFractional(0.0, SEEK_EXACT);
doSeekPlayPos(0.0, SEEK_EXACT);
m_pause.unlock();

// Close open file handles by unloading the current track
Expand Down Expand Up @@ -1325,24 +1328,6 @@ double EngineBuffer::getTrackSamples() {
return m_pTrackSamples->get();
}

/*
void EngineBuffer::setReader(CachingReader* pReader) {
disconnect(m_pReader, 0, this, 0);
delete m_pReader;
m_pReader = pReader;
m_pReadAheadManager->setReader(pReader);
connect(m_pReader, &CachingReader::trackLoading,
this, &EngineBuffer::slotTrackLoading,
Qt::DirectConnection);
connect(m_pReader, &CachingReader::trackLoaded,
this, &EngineBuffer::slotTrackLoaded,
Qt::DirectConnection);
connect(m_pReader, &CachingReader::trackLoadFailed,
this, &EngineBuffer::slotTrackLoadFailed,
Qt::DirectConnection);
}
*/

void EngineBuffer::setScalerForTest(EngineBufferScale* pScaleVinyl,
EngineBufferScale* pScaleKeylock) {
m_pScaleVinyl = pScaleVinyl;
Expand Down
9 changes: 3 additions & 6 deletions src/engine/readaheadmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,9 @@ class ReadAheadManager {
// indicate that the given portion of a song is about to be read.
virtual void hintReader(double dRate, HintVector* hintList);

virtual double getFilePlaypositionFromLog(double currentFilePlayposition,
double numConsumedSamples);

virtual void setReader(CachingReader* pReader) {
m_pReader = pReader;
}
virtual double getFilePlaypositionFromLog(
double currentFilePlayposition,
double numConsumedSamples);

private:
// An entry in the read log indicates the virtual playposition the read
Expand Down
Loading