oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: un-inline several methods

Browse Source
This commit is contained in:
Max Kellermann 2021-10-23 12:01:38 +02:00
parent a9344fafe9
commit bf1d77a4d8
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -344,39 +344,9 @@ private:
/** /**
* @return false if no data was moved * @return false if no data was moved
*/ */
bool CopyRingToPeriodBuffer() noexcept { bool CopyRingToPeriodBuffer() noexcept;
if (period_buffer.IsFull())
return false;
size_t nbytes = ring_buffer->pop(period_buffer.GetTail(), snd_pcm_sframes_t WriteFromPeriodBuffer() noexcept;
period_buffer.GetSpaceBytes());
if (nbytes == 0)
return false;
period_buffer.AppendBytes(nbytes);
const std::lock_guard<Mutex> lock(mutex);
/* notify the OutputThread that there is now
room in ring_buffer */
cond.notify_one();
return true;
}
snd_pcm_sframes_t WriteFromPeriodBuffer() noexcept {
assert(period_buffer.IsFull());
assert(period_buffer.GetFrames(out_frame_size) > 0);
auto frames_written = snd_pcm_writei(pcm, period_buffer.GetHead(),
period_buffer.GetFrames(out_frame_size));
if (frames_written > 0) {
written = true;
period_buffer.ConsumeFrames(frames_written,
out_frame_size);
}
return frames_written;
}
void LockCaughtError() noexcept { void LockCaughtError() noexcept {
period_buffer.Clear(); period_buffer.Clear();
@ -833,6 +803,44 @@ AlsaOutput::Recover(int err) noexcept
return err; return err;
} }
bool
AlsaOutput::CopyRingToPeriodBuffer() noexcept
{
if (period_buffer.IsFull())
return false;
size_t nbytes = ring_buffer->pop(period_buffer.GetTail(),
period_buffer.GetSpaceBytes());
if (nbytes == 0)
return false;
period_buffer.AppendBytes(nbytes);
const std::lock_guard<Mutex> lock(mutex);
/* notify the OutputThread that there is now
room in ring_buffer */
cond.notify_one();
return true;
}
snd_pcm_sframes_t
AlsaOutput::WriteFromPeriodBuffer() noexcept
{
assert(period_buffer.IsFull());
assert(period_buffer.GetFrames(out_frame_size) > 0);
auto frames_written = snd_pcm_writei(pcm, period_buffer.GetHead(),
period_buffer.GetFrames(out_frame_size));
if (frames_written > 0) {
written = true;
period_buffer.ConsumeFrames(frames_written,
out_frame_size);
}
return frames_written;
}
inline bool inline bool
AlsaOutput::DrainInternal() AlsaOutput::DrainInternal()
{ {