summaryrefslogtreecommitdiffstats
path: root/mixer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-04-10 04:45:53 +0300
committerUoti Urpala <uau@mplayer2.org>2012-04-11 03:56:28 +0300
commit39aa7d9846a8a04e8f08acc0ea9e2ce38336e523 (patch)
tree2280ab1d42123798bdbb70c83a31c959f949fb94 /mixer.h
parent9624f10aa85039c73d4bdb70e8062daeabaa90c6 (diff)
downloadmpv-39aa7d9846a8a04e8f08acc0ea9e2ce38336e523.tar.bz2
mpv-39aa7d9846a8a04e8f08acc0ea9e2ce38336e523.tar.xz
mixer: support native audio driver mute
Make mixer support setting the mute attribute at audio driver level, if one exists separately from volume. As of this commit, no libao2 driver exposes such an attribute yet; that will be added in later commits. Since the mute status can now be set externally, it's no longer completely obvious when the player should automatically disable mute when uninitializing an audio output. The implemented behavior is to turn mute off at uninitialization if we turned it on and haven't noticed it turn off (by external means) since.
Diffstat (limited to 'mixer.h')
-rw-r--r--mixer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/mixer.h b/mixer.h
index c1903750f1..efeb62856f 100644
--- a/mixer.h
+++ b/mixer.h
@@ -31,6 +31,8 @@ typedef struct mixer {
bool softvol;
float softvol_max;
bool muted;
+ bool muted_by_us;
+ bool muted_using_volume;
float vol_l, vol_r;
/* Contains ao driver name or "softvol" if volume is not persistent
* and needs to be restored after the driver is reinitialized. */