summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-23 10:06:37 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-23 10:06:37 +0000
commit14ab0d65ab13428ff468d6966ea5018819aa5143 (patch)
treebe4ba2e3160cd8eae0c55d6b8ba6ad01652b36e0 /Gui
parent40e88dd7e477068eb3baf991becdb1c5753cd1c3 (diff)
downloadmpv-14ab0d65ab13428ff468d6966ea5018819aa5143.tar.bz2
mpv-14ab0d65ab13428ff468d6966ea5018819aa5143.tar.xz
fix examples for ao_alsa options dialog and add example for mixer index.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13444 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/gtk/opts.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 283d942c77..8be4f61258 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -1346,13 +1346,13 @@ GList *appendOSSMixerChannels(GList *l) {
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
GList *appendALSADevices(GList *l) {
l = g_list_append(l, (gpointer)"default");
- l = g_list_append(l, (gpointer)"hw#0.0");
- l = g_list_append(l, (gpointer)"hw#0.1");
- l = g_list_append(l, (gpointer)"hw#0.2");
+ l = g_list_append(l, (gpointer)"hw=0.0");
+ l = g_list_append(l, (gpointer)"hw=0.1");
+ l = g_list_append(l, (gpointer)"hw=0.2");
l = g_list_append(l, (gpointer)"surround40");
l = g_list_append(l, (gpointer)"surround51");
- l = g_list_append(l, (gpointer)"plug:surround40");
- l = g_list_append(l, (gpointer)"plug:surround51");
+ l = g_list_append(l, (gpointer)"plug=surround40");
+ l = g_list_append(l, (gpointer)"plug=surround51");
return l;
}
@@ -1365,6 +1365,7 @@ GList *appendALSAMixerChannels(GList *l) {
l = g_list_append(l, (gpointer)"Master");
l = g_list_append(l, (gpointer)"Line");
l = g_list_append(l, (gpointer)"PCM");
+ l = g_list_append(l, (gpointer)"PCM,1");
return l;
}
#endif