mixer_api: replaced method "control()" with "{get,set}_volume()"

The method control() is too complicated, and overengineered.  Replace
it with two trivial functions: get_volume() and set_volume().

1 files changed, 28 insertions, 6 deletions

diff --git a/src/mixer_api.h b/src/mixer_api.h
index b79d02a1..8dbbbe82 100644
--- a/src/mixer_api.h
+++ b/src/mixer_api.h
@@ -45,14 +45,25 @@ struct mixer_plugin {
 	bool (*open)(struct mixer *data);
 
         /**
-	 * Control mixer device.
-         */
-	bool (*control)(struct mixer *data, int cmd, void *arg);
-
-        /**
     	 * Close mixer device
 	 */
 	void (*close)(struct mixer *data);
+
+	/**
+	 * Reads the current volume.
+	 *
+	 * @return the current volume (0..100 including) or -1 on
+	 * error
+	 */
+	int (*get_volume)(struct mixer *mixer);
+
+	/**
+	 * Sets the volume.
+	 *
+	 * @param volume the new volume (0..100 including)
+	 * @return true on success
+	 */
+	bool (*set_volume)(struct mixer *mixer, unsigned volume);
 };
 
 struct mixer {
@@ -72,7 +83,18 @@ void
 mixer_free(struct mixer *mixer);
 
 bool mixer_open(struct mixer *mixer);
-bool mixer_control(struct mixer *mixer, int cmd, void *arg);
 void mixer_close(struct mixer *mixer);
 
+static inline int
+mixer_get_volume(struct mixer *mixer)
+{
+	return mixer->plugin->get_volume(mixer);
+}
+
+static inline bool
+mixer_set_volume(struct mixer *mixer, unsigned volume)
+{
+	return mixer->plugin->set_volume(mixer, volume);
+}
+
 #endif