diff options
author | Kevin Mitchell <kevmitch@gmail.com> | 2015-11-19 05:11:45 -0800 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-11-19 07:14:50 -0800 |
commit | e10727baa70b8b7cd3d0f3182f8346a72341e68f (patch) | |
tree | 34994636fc8de0b49552beeb680df77e6656086e /audio/out | |
parent | a6fb80baa488516d463d92a3ebc619a62e3fb6cc (diff) | |
download | mpv-e10727baa70b8b7cd3d0f3182f8346a72341e68f.tar.bz2 mpv-e10727baa70b8b7cd3d0f3182f8346a72341e68f.tar.xz |
ao_wasapi: only report per-app volume in shared mode
otherwise we were incorrectly adjusting the hardware master volume
in exclusive mode with softvol=auto
Diffstat (limited to 'audio/out')
-rw-r--r-- | audio/out/ao_wasapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 81b7535c4b..83e7f469df 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -341,7 +341,8 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) return CONTROL_OK; case AOCONTROL_HAS_PER_APP_VOLUME: - return CONTROL_TRUE; + return state->share_mode == AUDCLNT_SHAREMODE_SHARED ? + CONTROL_TRUE : CONTROL_FALSE; case AOCONTROL_UPDATE_STREAM_TITLE: { MP_VERBOSE(state, "Updating stream title to \"%s\"\n", (char*)arg); wchar_t *title = mp_from_utf8(NULL, (char*)arg); |