summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-19 14:32:47 +0200
committerwm4 <wm4@nowhere>2013-09-20 13:23:25 +0200
commitb8e42ae13c511855fcba0b6b795d55b37e461665 (patch)
treef7090d8218894692ac600da6e7d6e62c382d1731 /audio
parent234d967bed3784657279052e23fdfa751ae1e7fc (diff)
downloadmpv-b8e42ae13c511855fcba0b6b795d55b37e461665.tar.bz2
mpv-b8e42ae13c511855fcba0b6b795d55b37e461665.tar.xz
mixer: restore volume with playback resume
Note that this is intentionally never done if the AO or softvolume is different, or if the current volume control method is thought to control system wide volume (such as ALSA) or otherwise user controllable (such as PulseAudio). The intention is to keep things robust and to avoid messing with the user's audio settings as far as possible, while still providing the ability to resume volume if it makes sense.
Diffstat (limited to 'audio')
-rw-r--r--audio/mixer.c30
-rw-r--r--audio/mixer.h1
2 files changed, 30 insertions, 1 deletions
diff --git a/audio/mixer.c b/audio/mixer.c
index 4407e8969f..3e16ce5f8e 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -17,6 +17,7 @@
*/
#include <string.h>
+#include <stdio.h>
#include <libavutil/common.h>
@@ -24,6 +25,7 @@
#include "audio/out/ao.h"
#include "audio/filter/af.h"
#include "mpvcore/mp_msg.h"
+#include "talloc.h"
#include "mixer.h"
void mixer_init(struct mixer *mixer, struct MPOpts *opts)
@@ -228,6 +230,14 @@ void mixer_setbalance(mixer_t *mixer, float val)
AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val);
}
+char *mixer_get_volume_restore_data(struct mixer *mixer)
+{
+ if (!mixer->driver[0])
+ return NULL;
+ return talloc_asprintf(NULL, "%s:%f:%f:%d", mixer->driver, mixer->vol_l,
+ mixer->vol_r, mixer->muted_by_us);
+}
+
static void probe_softvol(struct mixer *mixer)
{
if (mixer->opts->softvol == SOFTVOL_AUTO) {
@@ -286,10 +296,28 @@ static void restore_volume(struct mixer *mixer)
if (opts->mixer_init_mute >= 0)
force_mute = opts->mixer_init_mute;
+ // Set parameters from playback resume.
+ char *restore_data = mixer->opts->mixer_restore_volume_data;
+ if (restore && restore_data && restore_data[0]) {
+ char drv[40];
+ float v_l, v_r;
+ int m;
+ if (sscanf(restore_data, "%39[^:]:%f:%f:%d", drv, &v_l, &v_r, &m) == 4) {
+ if (strcmp(mixer->driver, drv) == 0) {
+ force_vol_l = v_l;
+ force_vol_r = v_r;
+ force_mute = !!m;
+ }
+ }
+ talloc_free(restore_data);
+ mixer->opts->mixer_restore_volume_data = NULL;
+ }
+
// Using --volume should not reset the volume on every file (i.e. reinit),
// OTOH mpv --{ --volume 10 f1.mkv --} --{ --volume 20 f2.mkv --} must work.
// Resetting the option volumes to "auto" (-1) is easiest. If file local
- // options (as shown above) are used, these are reset to other values.
+ // options (as shown above) are used, the option handler code will reset
+ // them to other values, and force the volume to be reset as well.
opts->mixer_init_volume = -1;
opts->mixer_init_mute = -1;
diff --git a/audio/mixer.h b/audio/mixer.h
index 6761be5da4..a636a2b418 100644
--- a/audio/mixer.h
+++ b/audio/mixer.h
@@ -59,5 +59,6 @@ void mixer_setmute(mixer_t *mixer, bool mute);
bool mixer_getmute(mixer_t *mixer);
void mixer_getbalance(mixer_t *mixer, float *bal);
void mixer_setbalance(mixer_t *mixer, float bal);
+char *mixer_get_volume_restore_data(struct mixer *mixer);
#endif /* MPLAYER_MIXER_H */