shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Midi input causes audio glitches.

Browse Source
This commit is contained in:
Robin Davies
2024-09-14 06:46:50 -04:00
parent 2b0118472f
commit 8df23db41c
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AlsaDriver.cpp
+47 -34
View File
@@ -1422,45 +1422,58 @@ namespace pipedal
} }
// snd_pcm_wait(captureHandle, 1); // snd_pcm_wait(captureHandle, 1);
ssize_t framesToRead = bufferSize;
ssize_t framesRead; ssize_t framesRead = 0;
if ((framesRead = ReadBuffer(captureHandle, this->rawCaptureBuffer, bufferSize)) < 0) bool xrun = false;
while (framesToRead != 0)
{ {
this->driverHost->OnUnderrun(); ssize_t thisTime = framesToRead;
auto state = snd_pcm_state(playbackHandle); ssize_t nFrames;
XrunRecoverInputUnderrun(captureHandle, framesRead); if ((nFrames = ReadBuffer(
continue; captureHandle,
} this->rawCaptureBuffer + this->captureFrameSize*framesRead,
else bufferSize)) < 0)
{
cpuUse.AddSample(ProfileCategory::Read);
if (framesRead == 0)
continue;
if (framesRead != bufferSize)
{
throw PiPedalStateException("Invalid read.");
}
(this->*copyInputFn)(framesRead);
cpuUse.AddSample(ProfileCategory::Driver);
this->driverHost->OnProcess(framesRead);
cpuUse.AddSample(ProfileCategory::Execute);
(this->*copyOutputFn)(framesRead);
cpuUse.AddSample(ProfileCategory::Driver);
// process.
ssize_t err = WriteBuffer(playbackHandle, rawPlaybackBuffer, framesRead);
if (err < 0)
{ {
this->driverHost->OnUnderrun(); this->driverHost->OnUnderrun();
XrunRecoverOutputOverrun(playbackHandle, err); auto state = snd_pcm_state(playbackHandle);
XrunRecoverInputUnderrun(captureHandle, nFrames);
xrun = true;
break;
} }
cpuUse.AddSample(ProfileCategory::Write); framesRead += nFrames;
framesToRead -= nFrames;
} }
if (xrun)
{
continue;
}
cpuUse.AddSample(ProfileCategory::Read);
if (framesRead == 0)
continue;
if (framesRead != bufferSize)
{
throw PiPedalStateException("Invalid read.");
}
(this->*copyInputFn)(framesRead);
cpuUse.AddSample(ProfileCategory::Driver);
this->driverHost->OnProcess(framesRead);
cpuUse.AddSample(ProfileCategory::Execute);
(this->*copyOutputFn)(framesRead);
cpuUse.AddSample(ProfileCategory::Driver);
// process.
ssize_t err = WriteBuffer(playbackHandle, rawPlaybackBuffer, framesRead);
if (err < 0)
{
this->driverHost->OnUnderrun();
XrunRecoverOutputOverrun(playbackHandle, err);
}
cpuUse.AddSample(ProfileCategory::Write);
} }
} }
catch (const std::exception &e) catch (const std::exception &e)