summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-04-07 16:26:56 +0300
committerUoti Urpala <uau@mplayer2.org>2012-04-08 16:35:09 +0300
commit3a01606dc05b2cedb9792a6f8adefeba6e434ab0 (patch)
tree4fe7f5735617f05e6726d4b2006676fc774ec64f /libao2/audio_out.c
parent485f439cfefd4fa8d35f406fd8694e649bd536c8 (diff)
downloadmpv-3a01606dc05b2cedb9792a6f8adefeba6e434ab0.tar.bz2
mpv-3a01606dc05b2cedb9792a6f8adefeba6e434ab0.tar.xz
libao2: change control() types to enum, remove unused ones
Change the audio driver control() command argument from "int" to "enum aocontrol". Remove unused control types (SET_DEVICE, GET_DEVICE, QUERY_FORMAT, SET_PLUGIN_DRIVER, SET_PLUGIN_LIST). The QUERY_FORMAT one looks like there's a possibility such functionality could be useful in the future, but as ao_oss was the only driver to have an actual implementation of it, the current code wasn't worth keeping.
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 6130e2ed33..268c17d749 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -232,7 +232,7 @@ int ao_play(struct ao *ao, void *data, int len, int flags)
return ao->driver->play(ao, data, len, flags);
}
-int ao_control(struct ao *ao, int cmd, void *arg)
+int ao_control(struct ao *ao, enum aocontrol cmd, void *arg)
{
if (ao->driver->control)
return ao->driver->control(ao, cmd, arg);
@@ -299,7 +299,7 @@ int old_ao_play(struct ao *ao, void *data, int len, int flags)
return ao->driver->old_functions->play(data, len, flags);
}
-int old_ao_control(struct ao *ao, int cmd, void *arg)
+int old_ao_control(struct ao *ao, enum aocontrol cmd, void *arg)
{
return ao->driver->old_functions->control(cmd, arg);
}