output: renamed method names

No CamelCase.  Also don't declare typedefs for the methods.

1 files changed, 12 insertions, 22 deletions

diff --git a/src/output_api.h b/src/output_api.h
index ca4c8c5a1..df1fb7e4c 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -32,36 +32,26 @@
 
 struct audio_output;
 
-typedef int (*AudioOutputTestDefaultDeviceFunc) (void);
-
-typedef int (*AudioOutputInitDriverFunc) (struct audio_output *audioOutput,
-					  ConfigParam * param);
+struct audio_output_plugin {
+	const char *name;
 
-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,
-				    const char *playChunk, size_t size);
+	void (*finish)(struct audio_output *ao);
 
-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,
-					     const struct tag *tag);
+	void (*cancel)(struct audio_output *ao);
 
-struct audio_output_plugin {
-	const char *name;
+	void (*close)(struct audio_output *ao);
 
-	AudioOutputTestDefaultDeviceFunc testDefaultDeviceFunc;
-	AudioOutputInitDriverFunc initDriverFunc;
-	AudioOutputFinishDriverFunc finishDriverFunc;
-	AudioOutputOpenDeviceFunc openDeviceFunc;
-	AudioOutputPlayFunc playFunc;
-	AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
-	AudioOutputCloseDeviceFunc closeDeviceFunc;
-	AudioOutputSendMetadataFunc sendMetdataFunc;
+	void (*send_tag)(struct audio_output *audioOutput,
+			 const struct tag *tag);
 };
 
 struct audio_output {