Commit a8dcf91d authored by David Fuhrmann's avatar David Fuhrmann

Fix text for stereo-mode variable

The text needs to be always set, as its used by the GUI.
parent 58774c32
...@@ -369,9 +369,15 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -369,9 +369,15 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt)
} }
if (!var_Type (aout, "stereo-mode")) if (!var_Type (aout, "stereo-mode"))
{
var_Create (aout, "stereo-mode", var_Create (aout, "stereo-mode",
VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT); VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT);
vlc_value_t txt;
txt.psz_string = _("Audio Channels");
var_Change (aout, "stereo-mode", VLC_VAR_SETTEXT, &txt, NULL);
}
/* The user may have selected a different channels configuration. */ /* The user may have selected a different channels configuration. */
var_AddCallback (aout, "stereo-mode", aout_ChannelsRestart, NULL); var_AddCallback (aout, "stereo-mode", aout_ChannelsRestart, NULL);
switch (var_GetInteger (aout, "stereo-mode")) switch (var_GetInteger (aout, "stereo-mode"))
...@@ -400,8 +406,6 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -400,8 +406,6 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt)
vlc_value_t val, txt; vlc_value_t val, txt;
val.i_int = 0; val.i_int = 0;
var_Change (aout, "stereo-mode", VLC_VAR_DELCHOICE, &val, NULL); var_Change (aout, "stereo-mode", VLC_VAR_DELCHOICE, &val, NULL);
txt.psz_string = _("Stereo audio mode");
var_Change (aout, "stereo-mode", VLC_VAR_SETTEXT, &txt, NULL);
if (fmt->i_original_channels & AOUT_CHAN_DOLBYSTEREO) if (fmt->i_original_channels & AOUT_CHAN_DOLBYSTEREO)
{ {
val.i_int = AOUT_VAR_CHAN_DOLBYS; val.i_int = AOUT_VAR_CHAN_DOLBYS;
......
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