allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Smooth play range change almost working...

Browse Source
This commit is contained in:
xenakios 2018-02-22 21:03:46 +02:00
parent a8079b277f
commit 122c90bf3f
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Source/PS_Source/Input/AInputS.h
View File

@ -117,12 +117,20 @@ public:
if (m_afreader) if (m_afreader)
inchans = m_afreader->numChannels; inchans = m_afreader->numChannels;
else inchans = m_readbuf.getNumChannels(); else inchans = m_readbuf.getNumChannels();
int64_t subsect_t0 = (int64_t)(m_activerange.getStart()*info.nsamples); int64_t subsect_t0 = 0;
int64_t subsect_t1 = (int64_t)(m_activerange.getEnd()*info.nsamples); int64_t subsect_t1 = 0;
int64_t subsectlen = subsect_t1 - subsect_t0; int64_t subsectlen = 0;
int xfadelen = m_xfadelen; int xfadelen = 0;
if (xfadelen >= subsectlen) auto updatesamplepositions = [&,this]()
xfadelen = int(subsectlen - 2); {
subsect_t0 = (int64_t)(m_activerange.getStart()*info.nsamples);
subsect_t1 = (int64_t)(m_activerange.getEnd()*info.nsamples);
subsectlen = subsect_t1 - subsect_t0;
xfadelen = m_xfadelen;
if (xfadelen >= subsectlen)
xfadelen = int(subsectlen - 2);
};
updatesamplepositions();
auto getSampleLambda=[this](int64_t pos, int ch) auto getSampleLambda=[this](int64_t pos, int ch)
{ {
if (m_cached_file_range.contains(pos)) if (m_cached_file_range.contains(pos))
@ -182,7 +190,14 @@ public:
//Logger::writeToLog("Doing seek " + String(m_seekfade.requestedpos)); //Logger::writeToLog("Doing seek " + String(m_seekfade.requestedpos));
m_seekfade.counter = 0; m_seekfade.counter = 0;
m_seekfade.state = 3; m_seekfade.state = 3;
seekImpl(m_seekfade.requestedpos); if (m_seekfade.requestedrange.isEmpty() == false)
{
setActiveRangeImpl(m_seekfade.requestedrange);
updatesamplepositions();
if (m_activerange.contains(getCurrentPositionPercent()) == false)
seekImpl(m_activerange.getStart());
}
} }
} }
if (m_seekfade.state == 3) if (m_seekfade.state == 3)
@ -196,6 +211,7 @@ public:
m_seekfade.counter = 0; m_seekfade.counter = 0;
m_seekfade.state = 0; m_seekfade.state = 0;
m_seekfade.requestedpos = 0.0; m_seekfade.requestedpos = 0.0;
m_seekfade.requestedrange = Range<double>();
} }
} }
for (int j = 0; j < numchans; ++j) for (int j = 0; j < numchans; ++j)
@ -299,7 +315,7 @@ public:
m_cached_crossfade_range = m_cached_crossfade_range =
Range<int64_t>((int64_t)(m_activerange.getStart()*info.nsamples),(int64_t)(m_activerange.getStart()*info.nsamples+m_xfadelen)); Range<int64_t>((int64_t)(m_activerange.getStart()*info.nsamples),(int64_t)(m_activerange.getStart()*info.nsamples+m_xfadelen));
} }
void setActiveRange(Range<double> rng) override void setActiveRangeImpl(Range<double> rng)
{ {
if (rng.getEnd() < rng.getStart()) if (rng.getEnd() < rng.getStart())
rng = { 0.0,1.0 }; rng = { 0.0,1.0 };
@ -307,7 +323,18 @@ public:
rng = { 0.0,1.0 }; rng = { 0.0,1.0 };
m_activerange = rng; m_activerange = rng;
m_loopcount = 0; m_loopcount = 0;
updateXFadeCache(); updateXFadeCache();
}
void setActiveRange(Range<double> rng) override
{
std::lock_guard<std::mutex> locker(m_mutex);
m_seekfade.requestedrange = rng;
if (m_seekfade.state == 0)
{
m_seekfade.counter = 0;
m_seekfade.state = 1;
}
m_seekfade.length = 16384;
} }
void setLoopEnabled(bool b) override void setLoopEnabled(bool b) override
{ {
@ -362,5 +389,6 @@ private:
int counter = 0; int counter = 0;
int length = 44100; int length = 44100;
double requestedpos = 0.0; double requestedpos = 0.0;
Range<double> requestedrange;
} m_seekfade; } m_seekfade;
}; };

4
Source/PS_Source/StretchSource.cpp
View File

@ -649,8 +649,8 @@ void StretchAudioSource::setPlayRange(Range<double> playrange, bool isloop)
m_stream_end_reached = false; m_stream_end_reached = false;
m_inputfile->setActiveRange(m_playrange); m_inputfile->setActiveRange(m_playrange);
m_inputfile->setLoopEnabled(isloop); m_inputfile->setLoopEnabled(isloop);
if (m_playrange.contains(m_seekpos) == false) //if (m_playrange.contains(m_seekpos) == false)
m_inputfile->seek(m_playrange.getStart()); // m_inputfile->seek(m_playrange.getStart());
m_seekpos = m_playrange.getStart(); m_seekpos = m_playrange.getStart();
++m_param_change_count; ++m_param_change_count;
m_cs.exit(); m_cs.exit();