Commit f54b115a authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files

aout: prepare the stereo-mode before starting the aout

This will allow to change aout->mixer_format before starting the aout,
cf. next commit.
parent de1e6c60
......@@ -734,6 +734,13 @@ int aout_OutputNew (audio_output_t *aout)
}
}
int stereo_mode =
aout_PrepareStereoMode(aout, fmt, i_nb_input_channels);
if (stereo_mode != AOUT_VAR_CHAN_UNSET
&& aout_HasStereoMode(aout, stereo_mode))
aout_UpdateStereoMode(aout, stereo_mode, fmt, filters_cfg);
aout->current_sink_info.headphones = false;
vlc_mutex_lock(&owner->lock);
......@@ -755,13 +762,6 @@ int aout_OutputNew (audio_output_t *aout)
}
assert(aout->flush && aout->play && aout->time_get && aout->pause);
int stereo_mode =
aout_PrepareStereoMode(aout, fmt, i_nb_input_channels);
if (stereo_mode != AOUT_VAR_CHAN_UNSET
&& aout_HasStereoMode(aout, stereo_mode))
aout_UpdateStereoMode(aout, stereo_mode, fmt, filters_cfg);
/* Autoselect the headphones mode if available and if the user didn't
* request any mode */
if (aout->current_sink_info.headphones
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment