diff options
author | wm4 <wm4@nowhere> | 2014-09-06 02:30:57 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-06 02:30:57 +0200 |
commit | 439a05d8c3c31ff4751a03dba69dfb96321a83e2 (patch) | |
tree | 270d1fa8ce2db5c3fb67771268382ef5523de38e /audio/out/ao_coreaudio.c | |
parent | 197f18402ed1e38e8e151a912e416e0b86d277d2 (diff) | |
download | mpv-439a05d8c3c31ff4751a03dba69dfb96321a83e2.tar.bz2 mpv-439a05d8c3c31ff4751a03dba69dfb96321a83e2.tar.xz |
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.
Diffstat (limited to 'audio/out/ao_coreaudio.c')
-rw-r--r-- | audio/out/ao_coreaudio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 7e5b3377c4..9335877208 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -136,6 +136,10 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) return get_volume(ao, arg); case AOCONTROL_SET_VOLUME: return set_volume(ao, arg); + case AOCONTROL_HAS_SOFT_VOLUME: + return CONTROL_TRUE; + case AOCONTROL_HAS_PER_APP_VOLUME: + return CONTROL_TRUE; } return CONTROL_UNKNOWN; } @@ -149,9 +153,6 @@ static int init(struct ao *ao) if (p->opt_list) ca_print_device_list(ao); - ao->per_application_mixer = true; - ao->no_persistent_volume = true; - OSStatus err = ca_select_device(ao, p->opt_device_id, &p->device); CHECK_CA_ERROR("failed to select device"); |