summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 3d38330c0a..d632bf5615 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -103,7 +103,6 @@
int slave_mode = 0;
int enable_mouse_movements = 0;
-float start_volume = -1;
#include "osdep/priority.h"
@@ -3947,8 +3946,11 @@ goto_enable_cache:
audio_delay += mpctx->sh_video->stream_delay;
}
if (mpctx->sh_audio) {
- if (start_volume >= 0)
- mixer_setvolume(&mpctx->mixer, start_volume, start_volume);
+ if (opts->mixer_init_volume >= 0)
+ mixer_setvolume(&mpctx->mixer, opts->mixer_init_volume,
+ opts->mixer_init_volume);
+ if (opts->mixer_init_mute >= 0)
+ mixer_setmute(&mpctx->mixer, opts->mixer_init_mute);
if (!ignore_start)
audio_delay -= mpctx->sh_audio->stream_delay;
}