summaryrefslogtreecommitdiffstats
path: root/audio/out/ao.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-06 02:30:57 +0200
committerwm4 <wm4@nowhere>2014-09-06 02:30:57 +0200
commit439a05d8c3c31ff4751a03dba69dfb96321a83e2 (patch)
tree270d1fa8ce2db5c3fb67771268382ef5523de38e /audio/out/ao.h
parent197f18402ed1e38e8e151a912e416e0b86d277d2 (diff)
downloadmpv-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.h')
-rw-r--r--audio/out/ao.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 3eb2925971..7badf90aef 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -36,7 +36,9 @@ enum aocontrol {
AOCONTROL_SET_MUTE,
// Has char* as argument, which contains the desired stream title.
AOCONTROL_UPDATE_STREAM_TITLE,
- AOCONTROL_HAS_TEMP_VOLUME,
+ // the AO does the equivalent of af_volume (return CONTROL_TRUE if yes)
+ AOCONTROL_HAS_SOFT_VOLUME,
+ // like above, but volume persists (per app), mpv won't restore volume
AOCONTROL_HAS_PER_APP_VOLUME,
};