output_plugin: replaced method "control()" with "mixer()"

The output plugin shouldn't know any specifics of the mixer API.  Make
it return the mixer object, and let the caller deal with it.

1 files changed, 17 insertions, 6 deletions

diff --git a/src/output_plugin.h b/src/output_plugin.h
index 0166322f..b652dc44 100644
--- a/src/output_plugin.h
+++ b/src/output_plugin.h
@@ -64,6 +64,15 @@ struct audio_output_plugin {
 	void (*finish)(void *data);
 
 	/**
+	 * Returns the mixer device associated with this audio output.
+	 * This does not actually open the mixer device yet.
+	 *
+	 * @return the mixer object, or NULL if there is no mixer
+	 * attached to this audio output
+	 */
+	struct mixer *(*get_mixer)(void *data);
+
+	/**
 	 * Really open the device.
 	 * @param audio_format the audio format in which data is going
 	 * to be delivered; may be modified by the plugin
@@ -104,12 +113,6 @@ struct audio_output_plugin {
 	 * for continue to pause
 	 */
 	bool (*pause)(void *data);
-
-	/**
-	 * Control the device. Usualy used for implementing
-	 * set and get mixer levels
-	 */
-	bool (*control)(void *data, int cmd, void *arg);
 };
 
 static inline bool
@@ -135,6 +138,14 @@ ao_plugin_finish(const struct audio_output_plugin *plugin, void *data)
 	plugin->finish(data);
 }
 
+static inline struct mixer *
+ao_plugin_get_mixer(const struct audio_output_plugin *plugin, void *data)
+{
+	return plugin->get_mixer != NULL
+		? plugin->get_mixer(data)
+		: NULL;
+}
+
 static inline bool
 ao_plugin_open(const struct audio_output_plugin *plugin,
 	       void *data, struct audio_format *audio_format)