summaryrefslogtreecommitdiffstats
path: root/mpvcore/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-19 14:31:43 +0200
committerwm4 <wm4@nowhere>2013-09-19 14:31:43 +0200
commit296531ad0050fbc38fb1cf7823f6e22f97d502b1 (patch)
tree3bc6c44114d00d643f6f5ed10907dfc98f10d5ac /mpvcore/mplayer.c
parent69e272dad707aae1ae99dabdf45bb82d3bf7a905 (diff)
downloadmpv-296531ad0050fbc38fb1cf7823f6e22f97d502b1.tar.bz2
mpv-296531ad0050fbc38fb1cf7823f6e22f97d502b1.tar.xz
mixer: minor refactoring
Let struct mixer access access MPOpts to simplify some things. Rename some variables and functions. There should be no functional changes.
Diffstat (limited to 'mpvcore/mplayer.c')
-rw-r--r--mpvcore/mplayer.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index d9715e447f..a2c96bb270 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -454,7 +454,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
if (mpctx->sh_audio)
uninit_audio(mpctx->sh_audio);
cleanup_demux_stream(mpctx, STREAM_AUDIO);
- mpctx->mixer.afilter = NULL;
+ mpctx->mixer.af = NULL;
}
if (mask & INITIALIZED_SUB) {
@@ -542,7 +542,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
if (mask & INITIALIZED_AO) {
mpctx->initialized_flags &= ~INITIALIZED_AO;
if (mpctx->mixer.ao)
- mixer_uninit(&mpctx->mixer);
+ mixer_uninit_audio(&mpctx->mixer);
mpctx->mixer.ao = NULL;
if (mpctx->ao)
ao_uninit(mpctx->ao, mpctx->stop_play != AT_END_OF_FILE);
@@ -1628,11 +1628,7 @@ static int recreate_audio_filters(struct MPContext *mpctx)
return -1;
}
- mpctx->mixer.afilter = mpctx->sh_audio->afilter;
- mpctx->mixer.volstep = opts->volstep;
- mpctx->mixer.softvol = opts->softvol;
- mpctx->mixer.softvol_max = opts->softvol_max;
- mixer_reinit(&mpctx->mixer, mpctx->ao);
+ mixer_reinit_audio(&mpctx->mixer, mpctx->ao, mpctx->sh_audio->afilter);
if (!(mpctx->initialized_flags & INITIALIZED_VOL)) {
if (opts->mixer_init_volume >= 0) {
mixer_setvolume(&mpctx->mixer, opts->mixer_init_volume,
@@ -4859,6 +4855,7 @@ static int mpv_main(int argc, char *argv[])
init_libav();
GetCpuCaps(&gCpuCaps);
screenshot_init(mpctx);
+ mpctx->mixer.opts = opts;
// Preparse the command line
m_config_preparse_command_line(mpctx->mconfig, argc, argv);