From 4d7ffa4faa4a7a887cf6cf3f400b5a7b9170e607 Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Mon, 18 Sep 2006 09:27:58 +0000
Subject: [PATCH] make it possible to select libao output driver

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1265 423420c4-83ab-492f-b58f-81f9feb106b5
---
 rdpsnd_libao.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/rdpsnd_libao.c b/rdpsnd_libao.c
index 917289c..1df1052 100644
--- a/rdpsnd_libao.c
+++ b/rdpsnd_libao.c
@@ -43,16 +43,17 @@ BOOL
 libao_open(void)
 {
 	ao_sample_format format;
-	static int warned = 0;
-
-	if (!warned && libao_device)
-	{
-		warning("device-options not supported for libao-driver\n");
-		warned = 1;
-	}
 
 	ao_initialize();
-	default_driver = ao_default_driver_id();
+
+	if (libao_device)
+	{
+		default_driver = ao_driver_id(libao_device);
+	}
+	else
+	{
+		default_driver = ao_default_driver_id();
+	}
 
 	format.bits = 16;
 	format.channels = 2;
@@ -233,6 +234,7 @@ struct audio_driver *
 libao_register(char *options)
 {
 	static struct audio_driver libao_driver;
+	static char description[101];
 
 	libao_driver.wave_out_write = rdpsnd_queue_write;
 	libao_driver.wave_out_open = libao_open;
@@ -242,10 +244,14 @@ libao_register(char *options)
 	libao_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
 	libao_driver.wave_out_play = libao_play;
 	libao_driver.name = xstrdup("libao");
-	libao_driver.description = xstrdup("libao output driver");
+	libao_driver.description = description;
 	libao_driver.need_byteswap_on_be = 0;
 	libao_driver.next = NULL;
 
+	ao_initialize();
+	snprintf(description, 100, "libao output driver, default device: %s", ao_driver_info(ao_default_driver_id())->short_name);
+	ao_shutdown();
+
 	if (options)
 	{
 		libao_device = xstrdup(options);