Skip to content

M
mpd
Commit 755d5507 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output: renamed method names

No CamelCase. Also don't declare typedefs for the methods.
parent 40a9961b
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 34 deletions
src/audioOutput.c
View file @ 755d5507
...@@ -67,10 +67,10 @@ int initAudioOutput(struct audio_output *ao, ConfigParam * param) ...@@ -67,10 +67,10 @@ int initAudioOutput(struct audio_output *ao, ConfigParam * param)
WARNING("Attempt to detect audio output device\n"); WARNING("Attempt to detect audio output device\n");
audio_output_plugins_for_each(plugin, i) { audio_output_plugins_for_each(plugin, i) {
if (plugin->testDefaultDeviceFunc) { if (plugin->test_default_device) {
WARNING("Attempting to detect a %s audio " WARNING("Attempting to detect a %s audio "
"device\n", plugin->name); "device\n", plugin->name);
if (plugin->testDefaultDeviceFunc() == 0) { if (plugin->test_default_device() == 0) {
WARNING("Successfully detected a %s " WARNING("Successfully detected a %s "
"audio device\n", plugin->name); "audio device\n", plugin->name);
break; break;
...@@ -110,7 +110,7 @@ int initAudioOutput(struct audio_output *ao, ConfigParam * param) ...@@ -110,7 +110,7 @@ int initAudioOutput(struct audio_output *ao, ConfigParam * param)
copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat); copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat);
} }
if (plugin->initDriverFunc(ao, param) != 0) if (plugin->init(ao, param) != 0)
return 0; return 0;
return 1; return 1;
...@@ -139,7 +139,7 @@ int openAudioOutput(struct audio_output *audioOutput, ...@@ -139,7 +139,7 @@ int openAudioOutput(struct audio_output *audioOutput,
} }
if (!audioOutput->open) if (!audioOutput->open)
ret = audioOutput->plugin->openDeviceFunc(audioOutput); ret = audioOutput->plugin->open(audioOutput);
audioOutput->sameInAndOutFormats = audioOutput->sameInAndOutFormats =
!cmpAudioFormat(&audioOutput->inAudioFormat, !cmpAudioFormat(&audioOutput->inAudioFormat,
...@@ -183,7 +183,7 @@ int playAudioOutput(struct audio_output *audioOutput, ...@@ -183,7 +183,7 @@ int playAudioOutput(struct audio_output *audioOutput,
convertAudioFormat(audioOutput, &playChunk, &size); convertAudioFormat(audioOutput, &playChunk, &size);
} }
ret = audioOutput->plugin->playFunc(audioOutput, playChunk, size); ret = audioOutput->plugin->play(audioOutput, playChunk, size);
return ret; return ret;
} }
...@@ -191,20 +191,20 @@ int playAudioOutput(struct audio_output *audioOutput, ...@@ -191,20 +191,20 @@ int playAudioOutput(struct audio_output *audioOutput,
void dropBufferedAudioOutput(struct audio_output *audioOutput) void dropBufferedAudioOutput(struct audio_output *audioOutput)
{ {
if (audioOutput->open) if (audioOutput->open)
audioOutput->plugin->dropBufferedAudioFunc(audioOutput); audioOutput->plugin->cancel(audioOutput);
} }
void closeAudioOutput(struct audio_output *audioOutput) void closeAudioOutput(struct audio_output *audioOutput)
{ {
if (audioOutput->open) if (audioOutput->open)
audioOutput->plugin->closeDeviceFunc(audioOutput); audioOutput->plugin->close(audioOutput);
} }
void finishAudioOutput(struct audio_output *audioOutput) void finishAudioOutput(struct audio_output *audioOutput)
{ {
closeAudioOutput(audioOutput); closeAudioOutput(audioOutput);
if (audioOutput->plugin->finishDriverFunc) if (audioOutput->plugin->finish)
audioOutput->plugin->finishDriverFunc(audioOutput); audioOutput->plugin->finish(audioOutput);
if (audioOutput->convBuffer) if (audioOutput->convBuffer)
free(audioOutput->convBuffer); free(audioOutput->convBuffer);
} }
...@@ -212,9 +212,8 @@ void finishAudioOutput(struct audio_output *audioOutput) ...@@ -212,9 +212,8 @@ void finishAudioOutput(struct audio_output *audioOutput)
void sendMetadataToAudioOutput(struct audio_output *audioOutput, void sendMetadataToAudioOutput(struct audio_output *audioOutput,
const struct tag *tag) const struct tag *tag)
{ {
if (!audioOutput->plugin->sendMetdataFunc) if (audioOutput->plugin->send_tag)
return; audioOutput->plugin->send_tag(audioOutput, tag);
audioOutput->plugin->sendMetdataFunc(audioOutput, tag);
} }
void printAllOutputPluginTypes(FILE * fp) void printAllOutputPluginTypes(FILE * fp)
......
src/output_api.h
View file @ 755d5507
...@@ -32,36 +32,26 @@ ...@@ -32,36 +32,26 @@
struct audio_output; struct audio_output;
typedef int (*AudioOutputTestDefaultDeviceFunc) (void); struct audio_output_plugin {
const char *name;
typedef int (*AudioOutputInitDriverFunc) (struct audio_output *audioOutput,
ConfigParam * param);
typedef void (*AudioOutputFinishDriverFunc) (struct audio_output *audioOutput); int (*test_default_device)(void);
typedef int (*AudioOutputOpenDeviceFunc) (struct audio_output *audioOutput); int (*init)(struct audio_output *ao, ConfigParam *param);
typedef int (*AudioOutputPlayFunc) (struct audio_output *audioOutput, void (*finish)(struct audio_output *ao);
const char *playChunk, size_t size);
typedef void (*AudioOutputDropBufferedAudioFunc) (struct audio_output *audioOutput); int (*open)(struct audio_output *ao);
typedef void (*AudioOutputCloseDeviceFunc) (struct audio_output *audioOutput); int (*play)(struct audio_output *ao,
const char *playChunk, size_t size);
typedef void (*AudioOutputSendMetadataFunc) (struct audio_output *audioOutput, void (*cancel)(struct audio_output *ao);
const struct tag *tag);
struct audio_output_plugin { void (*close)(struct audio_output *ao);
const char *name;
AudioOutputTestDefaultDeviceFunc testDefaultDeviceFunc; void (*send_tag)(struct audio_output *audioOutput,
AudioOutputInitDriverFunc initDriverFunc; const struct tag *tag);
AudioOutputFinishDriverFunc finishDriverFunc;
AudioOutputOpenDeviceFunc openDeviceFunc;
AudioOutputPlayFunc playFunc;
AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
AudioOutputCloseDeviceFunc closeDeviceFunc;
AudioOutputSendMetadataFunc sendMetdataFunc;
}; };
struct audio_output { struct audio_output {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment