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

osx: adapt to new output plugin API

Browse Source 
The OS X output plugin wasn't adapted to the new output plugin yet,
because I had no Mac to test...
This commit is contained in:
Max Kellermann 2008-11-04 11:19:37 +01:00
parent 792711bddd
commit 37696dcbbf
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/output/osx_plugin.c
View File

@ -77,15 +77,12 @@ static bool osx_testDefault()
return true; return true;
} }
static int osx_initDriver(struct audio_output *audioOutput, static void *
mpd_unused const struct audio_format *audio_format, osx_initDriver(mpd_unused struct audio_output *audioOutput,
ConfigParam * param) mpd_unused const struct audio_format *audio_format,
mpd_unused ConfigParam * param)
{ {
OsxData *od = newOsxData(); return newOsxData();
audioOutput->data = od;
return 0;
} }
static void freeOsxData(OsxData * od) static void freeOsxData(OsxData * od)
@ -97,24 +94,24 @@ static void freeOsxData(OsxData * od)
free(od); free(od);
} }
static void osx_finishDriver(struct audio_output *audioOutput) static void osx_finishDriver(void *data)
{ {
OsxData *od = (OsxData *) audioOutput->data; OsxData *od = data;
freeOsxData(od); freeOsxData(od);
} }
static void osx_dropBufferedAudio(struct audio_output *audioOutput) static void osx_dropBufferedAudio(void *data)
{ {
OsxData *od = (OsxData *) audioOutput->data; OsxData *od = data;
pthread_mutex_lock(&od->mutex); pthread_mutex_lock(&od->mutex);
od->len = 0; od->len = 0;
pthread_mutex_unlock(&od->mutex); pthread_mutex_unlock(&od->mutex);
} }
static void osx_closeDevice(struct audio_output *audioOutput) static void osx_closeDevice(void *data)
{ {
OsxData *od = (OsxData *) audioOutput->data; OsxData *od = data;
pthread_mutex_lock(&od->mutex); pthread_mutex_lock(&od->mutex);
while (od->len) { while (od->len) {
@ -213,10 +210,9 @@ static OSStatus osx_render(void *vdata,
} }
static bool static bool
osx_openDevice(struct audio_output *audioOutput, osx_openDevice(void *data, struct audio_format *audioFormat)
struct audio_format *audioFormat)
{ {
OsxData *od = (OsxData *) audioOutput->data; OsxData *od = data;
ComponentDescription desc; ComponentDescription desc;
Component comp; Component comp;
AURenderCallbackStruct callback; AURenderCallbackStruct callback;
@ -291,9 +287,9 @@ osx_openDevice(struct audio_output *audioOutput,
} }
static bool static bool
osx_play(struct audio_output *audioOutput, const char *playChunk, size_t size) osx_play(void *data, const char *playChunk, size_t size)
{ {
OsxData *od = (OsxData *) audioOutput->data; OsxData *od = data;
size_t bytesToCopy; size_t bytesToCopy;
size_t curpos; size_t curpos;