[vlc-commits] ALSA: list most preset devices in the static list

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr 14 22:10:17 2011 +0300| [0e19bbbe6a09d3936fe052ed22b22d08a299cb83] | committer: Rémi Denis-Courmont

ALSA: list most preset devices in the static list

This is only used when the update callback is not used though.

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

 modules/audio_output/alsa.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 822ef45..71f2a45 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -102,8 +102,22 @@ static void GetDevices( vlc_object_t *, module_config_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static const char *const ppsz_devices[] = { DEFAULT_ALSA_DEVICE };
-static const char *const ppsz_devices_text[] = { N_("Default") };
+static const char *const ppsz_devices[] = {
+    "default", "plug:front",
+    "plug:side", "plug:rear", "plug:center_lfe",
+    "plug:surround40", "plug:surround41",
+    "plug:surround50", "plug:surround51",
+    "plug:surround71",
+    "hdmi", "iec958",
+};
+static const char *const ppsz_devices_text[] = {
+    N_("Default"), N_("Front speakers"),
+    N_("Side speakers"), N_("Rear speakers"), N_("Center and subwoofer"),
+    N_("Surround 4.0"), N_("Surround 4.1"),
+    N_("Surround 5.0"), N_("Surround 5.1"),
+    N_("Surround 7.1"),
+    N_("HDMI"), N_("S/PDIF"),
+};
 vlc_module_begin ()
     set_shortname( "ALSA" )
     set_description( N_("ALSA audio output") )