diff options
| author | wm4 <wm4@nowhere> | 2016-07-09 18:31:18 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-07-09 18:31:18 +0200 |
| commit | 995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9 (patch) | |
| tree | 0442a9134e89408c2d8a791fefc1559d04d2b76f /audio/mixer.h | |
| parent | da9590d3681c8779ac50d7722f8b8ad09a47024a (diff) | |
| download | mpv-995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9.tar.bz2 mpv-995c47da9afacfcc30d8a17d2f2a2268fbf4fdb9.tar.xz | |
audio: drop --softvol=no and --softvol=auto
Drop the code for switching the volume options and properties between
af_volume and AO volume controls. interface-changes.rst mentions the
changes in detail.
Do this because this was exceedingly complex and had other problems as
well. It was also very hard to test. It's just not worth the trouble.
Some leftovers like AOCONTROL_HAS_PER_APP_VOLUME will be removed at a
later point.
Fixes #3322.
Diffstat (limited to 'audio/mixer.h')
| -rw-r--r-- | audio/mixer.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/audio/mixer.h b/audio/mixer.h index 4e2ff350ff..b475c12700 100644 --- a/audio/mixer.h +++ b/audio/mixer.h @@ -33,18 +33,11 @@ struct af_stream; struct mixer; struct mixer *mixer_init(void *talloc_ctx, struct mpv_global *global); -void mixer_reinit_audio(struct mixer *mixer, struct ao *ao, struct af_stream *af); +void mixer_reinit_audio(struct mixer *mixer, struct af_stream *af); void mixer_uninit_audio(struct mixer *mixer); bool mixer_audio_initialized(struct mixer *mixer); -void mixer_getvolume(struct mixer *mixer, float *l, float *r); -void mixer_setvolume(struct mixer *mixer, float l, float r); -void mixer_addvolume(struct mixer *mixer, float step); -void mixer_getbothvolume(struct mixer *mixer, float *b); -void mixer_setmute(struct mixer *mixer, bool mute); -bool mixer_getmute(struct mixer *mixer); +void mixer_update_volume(struct mixer *mixer); void mixer_getbalance(struct mixer *mixer, float *bal); void mixer_setbalance(struct mixer *mixer, float bal); -float mixer_getmaxvolume(struct mixer *mixer); -char *mixer_get_volume_restore_data(struct mixer *mixer); #endif /* MPLAYER_MIXER_H */ |