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

Remove the freeze seek code as it wasn't working. Best to postpone until the stretcher code has been rewritten.

Browse Source
This commit is contained in:
xenakios 2018-04-23 20:55:25 +03:00
parent 2d5064743c
commit 2f3a526291
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/PS_Source/StretchSource.cpp
View File

@ -246,12 +246,7 @@ void StretchAudioSource::getNextAudioBlock(const AudioSourceChannelInfo & buffer
if (m_stretchoutringbuf.available() > 0) if (m_stretchoutringbuf.available() > 0)
m_output_has_begun = true; m_output_has_begun = true;
bool freezing = m_freezing; bool freezing = m_freezing;
if (m_do_freeze_seek == true)
{
freezing = false;
m_stretchoutringbuf.clear();
m_firstbuffer = true;
}
if (m_stretchers[0]->isFreezing() != freezing) if (m_stretchers[0]->isFreezing() != freezing)
{ {
if (freezing == true && m_inputfile!=nullptr) if (freezing == true && m_inputfile!=nullptr)
@ -388,12 +383,7 @@ void StretchAudioSource::getNextAudioBlock(const AudioSourceChannelInfo & buffer
//Logger::writeToLog("Rerunning resampler task"); //Logger::writeToLog("Rerunning resampler task");
resamplertask(); resamplertask();
} }
if (m_do_freeze_seek == true)
{
for (auto& e : m_stretchers)
e->set_freezing(true);
m_do_freeze_seek = false;
}
bool source_ended = m_inputfile->hasEnded(); bool source_ended = m_inputfile->hasEnded();
double samplelimit = 16384.0; double samplelimit = 16384.0;
if (m_clip_output == true) if (m_clip_output == true)
@ -679,8 +669,6 @@ bool StretchAudioSource::isPaused() const
void StretchAudioSource::seekPercent(double pos) void StretchAudioSource::seekPercent(double pos)
{ {
ScopedLock locker(m_cs); ScopedLock locker(m_cs);
if (m_freezing == true)
m_do_freeze_seek = true;
m_seekpos = pos; m_seekpos = pos;
//m_resampler->Reset(); //m_resampler->Reset();
m_inputfile->seek(pos); m_inputfile->seek(pos);

2
Source/PS_Source/StretchSource.h
View File

@ -130,7 +130,7 @@ private:
double m_seekpos = 0.0; double m_seekpos = 0.0;
bool m_freezing = false; bool m_freezing = false;
bool m_do_freeze_seek = false;
int m_pause_state = 0; int m_pause_state = 0;
Range<double> m_playrange{ 0.0,1.0 }; Range<double> m_playrange{ 0.0,1.0 };
int64_t m_rand_count = 0; int64_t m_rand_count = 0;