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/mixer.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/mixer.c')
| -rw-r--r-- | audio/mixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/mixer.c b/audio/mixer.c index b19a2c6438..74c82f252c 100644 --- a/audio/mixer.c +++ b/audio/mixer.c @@ -248,7 +248,7 @@ static void probe_softvol(struct mixer *mixer) if (mixer->opts->softvol == SOFTVOL_AUTO) { // No system-wide volume => fine with AO volume control. mixer->softvol = - ao_control(mixer->ao, AOCONTROL_HAS_TEMP_VOLUME, 0) != 1 || + ao_control(mixer->ao, AOCONTROL_HAS_SOFT_VOLUME, 0) != 1 && ao_control(mixer->ao, AOCONTROL_HAS_PER_APP_VOLUME, 0) != 1; } else { mixer->softvol = mixer->opts->softvol == SOFTVOL_YES; @@ -283,7 +283,7 @@ static void restore_volume(struct mixer *mixer) mixer->driver = mixer->softvol ? "softvol" : ao_get_name(ao); bool restore = - mixer->softvol || ao_control(ao, AOCONTROL_HAS_TEMP_VOLUME, 0) == 1; + mixer->softvol || ao_control(ao, AOCONTROL_HAS_SOFT_VOLUME, 0) == 1; // Restore old parameters if volume won't survive reinitialization. // But not if volume scale is possibly different. |