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

output/osx: use DynamicFifoBuffer instead of struct fifo_buffer

Browse Source
This commit is contained in:
Max Kellermann 2013-12-19 10:49:31 +01:00
parent 5f14704eee
commit 0e84d71559
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/output/OSXOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "OSXOutputPlugin.hxx" #include "OSXOutputPlugin.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "util/fifo_buffer.h" #include "utill/DynamicFifoBuffer.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
@ -44,7 +44,7 @@ struct OSXOutput {
Mutex mutex; Mutex mutex;
Cond condition; Cond condition;
struct fifo_buffer *buffer; DynamicFifoBuffer<uint8_t> *buffer;
}; };
static constexpr Domain osx_output_domain("osx_output"); static constexpr Domain osx_output_domain("osx_output");
@ -207,22 +207,19 @@ osx_render(void *vdata,
od->mutex.lock(); od->mutex.lock();
size_t nbytes; auto src = od->buffer->Read();
const void *src = fifo_buffer_read(od->buffer, &nbytes); if (!src.IsEmpty()) {
if (src.size > buffer_size)
src.size = buffer_size;
if (src != NULL) { memcpy(buffer->mData, src.data, src.size);
if (nbytes > buffer_size) od->buffer->Consume(src.size);
nbytes = buffer_size; }
memcpy(buffer->mData, src, nbytes);
fifo_buffer_consume(od->buffer, nbytes);
} else
nbytes = 0;
od->condition.signal(); od->condition.signal();
od->mutex.unlock(); od->mutex.unlock();
buffer->mDataByteSize = nbytes; buffer->mDataByteSize = src.size;
unsigned i; unsigned i;
for (i = 1; i < buffer_list->mNumberBuffers; ++i) { for (i = 1; i < buffer_list->mNumberBuffers; ++i) {
@ -298,7 +295,7 @@ osx_output_cancel(struct audio_output *ao)
OSXOutput *od = (OSXOutput *)ao; OSXOutput *od = (OSXOutput *)ao;
const ScopeLock protect(od->mutex); const ScopeLock protect(od->mutex);
fifo_buffer_clear(od->buffer); od->buffer->Clear();
} }
static void static void
@ -309,7 +306,7 @@ osx_output_close(struct audio_output *ao)
AudioOutputUnitStop(od->au); AudioOutputUnitStop(od->au);
AudioUnitUninitialize(od->au); AudioUnitUninitialize(od->au);
fifo_buffer_free(od->buffer); delete od->buffer;
} }
static bool static bool
@ -370,8 +367,8 @@ osx_output_open(struct audio_output *ao, AudioFormat &audio_format,
} }
/* create a buffer of 1s */ /* create a buffer of 1s */
od->buffer = fifo_buffer_new(audio_format.sample_rate * od->buffer = new DynamicFifoBuffer<uint8_t>(audio_format.sample_rate *
audio_format.GetFrameSize()); audio_format.GetFrameSize());
status = AudioOutputUnitStart(od->au); status = AudioOutputUnitStart(od->au);
if (status != 0) { if (status != 0) {
@ -393,23 +390,21 @@ osx_output_play(struct audio_output *ao, const void *chunk, size_t size,
const ScopeLock protect(od->mutex); const ScopeLock protect(od->mutex);
void *dest; DynamicFifoBuffer<uint8_t>::Range dest;
size_t max_length;
while (true) { while (true) {
dest = fifo_buffer_write(od->buffer, &max_length); dest = od->buffer->Write();
if (dest != NULL) if (!dest.IsEmpty())
break; break;
/* wait for some free space in the buffer */ /* wait for some free space in the buffer */
od->condition.wait(od->mutex); od->condition.wait(od->mutex);
} }
if (size > max_length) if (size > dest.size)
size = max_length; size = dest.size;
memcpy(dest, chunk, size); memcpy(dest.data, chunk, size);
fifo_buffer_append(od->buffer, size); od->buffer->Append(size);
return size; return size;
} }