[vlc-commits] Fix text for stereo-mode variable

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Thu May 16 22:13:54 2013 +0200| [a8dcf91d5b37e9311e0821c65f56cb7af66bda36] | committer: David Fuhrmann

Fix text for stereo-mode variable

The text needs to be always set, as its used by the GUI.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a8dcf91d5b37e9311e0821c65f56cb7af66bda36
---

 src/audio_output/output.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 84653c3..6fed435 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -369,9 +369,15 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt)
     }
 
     if (!var_Type (aout, "stereo-mode"))
+    {
         var_Create (aout, "stereo-mode",
                     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. */
     var_AddCallback (aout, "stereo-mode", aout_ChannelsRestart, NULL);
     switch (var_GetInteger (aout, "stereo-mode"))
@@ -400,8 +406,6 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt)
             vlc_value_t val, txt;
             val.i_int = 0;
             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)
             {
                 val.i_int = AOUT_VAR_CHAN_DOLBYS;