From 439a05d8c3c31ff4751a03dba69dfb96321a83e2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 6 Sep 2014 02:30:57 +0200 Subject: audio/out: remove old things Remove the unnecessary indirection through ao fields. Also fix the inverted result of AOCONTROL_HAS_TEMP_VOLUME. Hopefully the change is equivalent. But actually, it looks like the old code did it wrong. --- audio/out/ao.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'audio/out/ao.c') diff --git a/audio/out/ao.c b/audio/out/ao.c index 56d9232189..00bda6d283 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -259,16 +259,7 @@ int ao_play(struct ao *ao, void **data, int samples, int flags) int ao_control(struct ao *ao, enum aocontrol cmd, void *arg) { - switch (cmd) { - case AOCONTROL_HAS_TEMP_VOLUME: - return !ao->no_persistent_volume; - case AOCONTROL_HAS_PER_APP_VOLUME: - return !!ao->per_application_mixer; - default: - if (ao->api->control) - return ao->api->control(ao, cmd, arg); - } - return CONTROL_UNKNOWN; + return ao->api->control ? ao->api->control(ao, cmd, arg) : CONTROL_UNKNOWN; } // Return size of the buffered data in seconds. Can include the device latency. -- cgit v1.2.3