Revision
15411
Author
andrew
Date
2009-11-10 12:11:30 -0600 (Tue, 10 Nov 2009)

Log Message



Modified Paths

Diff

Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (15410 => 15411)


--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c	2009-11-10 17:28:39 UTC (rev 15410)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c	2009-11-10 18:11:30 UTC (rev 15411)
@@ -1105,8 +1105,10 @@
 {
 	int i, numDevices, prev;
 	const PaDeviceInfo *deviceInfo;
+	const PaHostApiInfo *hostApiInfo;
 
 	numDevices = Pa_GetDeviceCount();
+
 	if (numDevices < 0) {
 		return SWITCH_STATUS_SUCCESS;
 	}
@@ -1116,7 +1118,8 @@
 
 		for (i = 0; i < numDevices; i++) {
 			deviceInfo = Pa_GetDeviceInfo(i);
-			stream->write_function(stream, "\t\t<device id=\"%d\" name=\"%s\" inputs=\"%d\" outputs=\"%d\" />\n", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+			hostApiInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
+			stream->write_function(stream, "\t\t<device id=\"%d\" name=\"%s\" hostapi=\"%s\" inputs=\"%d\" outputs=\"%d\" />\n", i, deviceInfo->name, hostApiInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
 		}
 
 		stream->write_function(stream, "\t</devices>\n\t<bindings>\n"
@@ -1128,8 +1131,10 @@
 
 		for (i = 0; i < numDevices; i++) {
 			deviceInfo = Pa_GetDeviceInfo(i);
-			stream->write_function(stream, "%d;%s;%d;%d;", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+			hostApiInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
 
+			stream->write_function(stream, "%d;%s(%s);%d;%d;", i, deviceInfo->name, hostApiInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+
 			prev = 0;
 			if (globals.ringdev == i) {
 				stream->write_function(stream, "r");