]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15411 d0543943-73ff-0310...
authorAndrew Thompson <andrew@hijacked.us>
Tue, 10 Nov 2009 18:11:30 +0000 (18:11 +0000)
committerAndrew Thompson <andrew@hijacked.us>
Tue, 10 Nov 2009 18:11:30 +0000 (18:11 +0000)
src/mod/endpoints/mod_portaudio/mod_portaudio.c

index 8b3a79f151d060315fd89bc11fdd1fc4ee7ec64d..f0f1e6f98169ab998ebc29825f074f37dc653d15 100644 (file)
@@ -1105,8 +1105,10 @@ static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *st
 {
        int i, numDevices, prev;
        const PaDeviceInfo *deviceInfo;
+       const PaHostApiInfo *hostApiInfo;
 
        numDevices = Pa_GetDeviceCount();
+
        if (numDevices < 0) {
                return SWITCH_STATUS_SUCCESS;
        }
@@ -1116,7 +1118,8 @@ static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *st
 
                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,7 +1131,9 @@ static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *st
 
                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) {