From 37bc31d161d486d0499cf64123b7561f57dd0c53 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 16 Feb 2009 01:39:00 +0100
Subject: 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.
---
 src/output/oss_plugin.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/output/oss_plugin.c')

diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index c4b4698ee..007d5bc84 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -410,6 +410,14 @@ static void oss_finishDriver(void *data)
 	freeOssData(od);
 }
 
+static struct mixer *
+oss_get_mixer(void *data)
+{
+	OssData *od = data;
+
+	return od->mixer;
+}
+
 static int setParam(OssData * od, unsigned param, int *value)
 {
 	int val = *value;
@@ -571,21 +579,14 @@ oss_playAudio(void *data, const char *playChunk, size_t size)
 	return true;
 }
 
-static bool
-oss_control(void *data, int cmd, void *arg)
-{
-	OssData *od = data;
-	return mixer_control(od->mixer, cmd, arg);
-}
-
 const struct audio_output_plugin ossPlugin = {
 	.name = "oss",
 	.test_default_device = oss_testDefault,
 	.init = oss_initDriver,
 	.finish = oss_finishDriver,
+	.get_mixer = oss_get_mixer,
 	.open = oss_openDevice,
 	.play = oss_playAudio,
 	.cancel = oss_dropBufferedAudio,
 	.close = oss_closeDevice,
-	.control = oss_control,
 };
-- 
cgit v1.2.3