vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jun 1 22:36:00 2011 +0300| [77ef67f7dc0257b54b776d662b78ea7274d2a140] | committer: Rémi Denis-Courmont
V4L2: put default audio-mode value in the value list Otherwise Qt4 selects another value by default and fails. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77ef67f7dc0257b54b776d662b78ea7274d2a140 --- modules/access/v4l2.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c index 108b7ec..a0ebd6e 100644 --- a/modules/access/v4l2.c +++ b/modules/access/v4l2.c @@ -252,12 +252,13 @@ static const int i_iomethod_list[] = static const char *const psz_iomethod_list_text[] = { N_("AUTO"), N_("READ"), N_("MMAP"), N_("USERPTR") }; -static const int i_tuner_audio_modes_list[] = - { V4L2_TUNER_MODE_MONO, V4L2_TUNER_MODE_STEREO, +static const int i_tuner_audio_modes_list[] = { + -1, V4L2_TUNER_MODE_MONO, V4L2_TUNER_MODE_STEREO, V4L2_TUNER_MODE_LANG1, V4L2_TUNER_MODE_LANG2, V4L2_TUNER_MODE_SAP, V4L2_TUNER_MODE_LANG1_LANG2 }; -static const char *const psz_tuner_audio_modes_list_text[] = - { N_( "Mono" ), +static const char *const psz_tuner_audio_modes_list_text[] = { + N_("Unspecified"), + N_( "Mono" ), N_( "Stereo" ), N_( "Primary language (Analog TV tuners only)" ), N_( "Secondary language (Analog TV tuners only)" ), _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
