[mod_portaudio, mod_portaudio_stream] Remove from tree

author Andrey Volk <andywolk@gmail.com>

Wed, 28 Aug 2024 17:35:10 +0000 (20:35 +0300)

committer Andrey Volk <andywolk@gmail.com>

Tue, 7 Jan 2025 16:18:03 +0000 (19:18 +0300)
author Andrey Volk <andywolk@gmail.com>
Wed, 28 Aug 2024 17:35:10 +0000 (20:35 +0300)
committer Andrey Volk <andywolk@gmail.com>
Tue, 7 Jan 2025 16:18:03 +0000 (19:18 +0300)
diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln

index f75602a56f9b424fbf23eccf21edc517368e0f51..230732acfbce61519e8c0673f720bfcc675ab232 100644 (file)
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -79,7 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
                 conf\vanilla\autoload_configs\logfile.conf.xml = conf\vanilla\autoload_configs\logfile.conf.xml\r
                 conf\vanilla\autoload_configs\modules.conf.xml = conf\vanilla\autoload_configs\modules.conf.xml\r
                 conf\vanilla\autoload_configs\openmrcp.conf.xml = conf\vanilla\autoload_configs\openmrcp.conf.xml\r
-               conf\vanilla\autoload_configs\portaudio.conf.xml = conf\vanilla\autoload_configs\portaudio.conf.xml\r
                 conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml\r
                 conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml\r
                 conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml\r
@@ -173,8 +172,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.2017.vcxproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"\r
  EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.2017.vcxproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"\r
-EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "docs\docs.2017.vcxproj", "{1A1FF289-4FD6-4285-A422-D31DD67A4723}"\r
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.2017.vcxproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"\r
@@ -234,8 +231,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2017.vcxproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}"\r
  EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\win32\portaudio\portaudio.2017.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"\r
-EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2017.vcxproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}"\r
  EndProject\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2017.vcxproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}"\r
@@ -604,17 +599,6 @@ Global
                 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32\r
                 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|x64\r
                 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.Build.0 = Release|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|Win32.ActiveCfg = Release|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.ActiveCfg = Release|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.All|x64.Build.0 = Release|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.ActiveCfg = Debug|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.Build.0 = Debug|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.ActiveCfg = Release|x64\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.Build.0 = Release|x64\r
                 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32\r
                 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32\r
                 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -910,17 +894,6 @@ Global
                 {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.Build.0 = Release|Win32\r
                 {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.ActiveCfg = Release|x64\r
                 {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.Build.0 = Release|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|Win32.ActiveCfg = Release DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.ActiveCfg = Release DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.All|x64.Build.0 = Release DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug DirectSound|Win32\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug DirectSound|Win32\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release DirectSound|Win32\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release DirectSound|Win32\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release DirectSound|x64\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release DirectSound|x64\r
                 {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|Win32.ActiveCfg = Release|x64\r
                 {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.ActiveCfg = Release|x64\r
                 {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.All|x64.Build.0 = Release|x64\r
@@ -2521,7 +2494,6 @@ Global
                 {3DAF028C-AB5B-4183-A01B-DCC43F5A87F0} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}\r
                 {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                 {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D}\r
-               {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                 {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A}\r
                 {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}\r
                 {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}\r
@@ -2550,7 +2522,6 @@ Global
                 {71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
                 {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                 {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}\r
-               {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                 {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                 {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                 {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
diff --git a/LICENSE b/LICENSE

index d106a66b4fd455956944a8e166723844f668954b..c5d335d31210656736105c7c2b7727a7de9a3dfb 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1533,15 +1533,6 @@ Files: src/mod/endpoints/mod_skinny/*.p[lm]
  Copyright: 2010, Mathieu Parent <math.parent@gmail.com>
  License: Perl
  
-Files: src/mod/endpoints/mod_portaudio/*
-Copyright: 1999-2000 Ross Bencina and Phil Burk
- 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
-Files: src/mod/endpoints/mod_portaudio/mod_portaudio.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
  Files: src/mod/endpoints/mod_sofia/sip-dig.c
  Copyright: 2006 Nokia Corporation
  License: LGPL-2.1+
diff --git a/build/modules.conf.in b/build/modules.conf.in

index 34266964dc64c0ea770246abf6f081a62c080ae9..76f192308c1f0eab043c872edc91979a057198c3 100755 (executable)
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -85,7 +85,6 @@ dialplans/mod_dialplan_xml
  #endpoints/mod_khomp
  endpoints/mod_loopback
  #endpoints/mod_opal
-#endpoints/mod_portaudio
  endpoints/mod_rtc
  #endpoints/mod_rtmp
  endpoints/mod_skinny
@@ -111,7 +110,6 @@ event_handlers/mod_event_socket
  formats/mod_local_stream
  formats/mod_native_file
  formats/mod_png
-#formats/mod_portaudio_stream
  #formats/mod_shell_stream
  #formats/mod_shout
  formats/mod_sndfile
diff --git a/build/modules.conf.most b/build/modules.conf.most

index c25126f5c8e680f8ba8b2f0a9c8dc5504a76b70d..943ff713367ee2974f4b2fed8d6d645e15a3121f 100755 (executable)
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@@ -83,7 +83,6 @@ directories/mod_ldap
  #endpoints/mod_khomp
  endpoints/mod_loopback
  #endpoints/mod_opal
-endpoints/mod_portaudio
  endpoints/mod_rtc
  endpoints/mod_rtmp
  endpoints/mod_skinny
@@ -107,7 +106,6 @@ formats/mod_imagick
  formats/mod_local_stream
  formats/mod_native_file
  formats/mod_png
-formats/mod_portaudio_stream
  formats/mod_shell_stream
  formats/mod_shout
  formats/mod_sndfile
diff --git a/conf/curl/autoload_configs/portaudio.conf.xml b/conf/curl/autoload_configs/portaudio.conf.xml

deleted file mode 100644 (file)

index 129576a..0000000
--- a/conf/curl/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-        partial case sensitive string match on something in the name 
-        or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-
-    <!--file to play when calls are on hold-->
-    <!--<param name="hold-file" value="/sounds/holdmusic.wav"/>-->
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="8000"/>
-    <param name="codec-ms" value="20"/>
-  </settings>
-</configuration>
diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml

index e54dbfe04fedbd91b208d6f74a9d311306183499..0e1f60f77d3dc3aaafba95305a1a4225fbff0335 100755 (executable)
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -29,7 +29,6 @@
      <!-- Endpoints -->
      <!-- <load module="mod_dingaling"/> -->
      <!-- <load module="mod_iax"/> -->
-    <!-- <load module="mod_portaudio"/> -->
      <!-- <load module="mod_alsa"/> -->
      <load module="mod_sofia"/>
      <load module="mod_loopback"/>
diff --git a/conf/insideout/autoload_configs/portaudio.conf.xml b/conf/insideout/autoload_configs/portaudio.conf.xml

deleted file mode 100644 (file)

index 129576a..0000000
--- a/conf/insideout/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-        partial case sensitive string match on something in the name 
-        or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-
-    <!--file to play when calls are on hold-->
-    <!--<param name="hold-file" value="/sounds/holdmusic.wav"/>-->
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="8000"/>
-    <param name="codec-ms" value="20"/>
-  </settings>
-</configuration>
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml

index 2bc4376215414403d1d2160d5850743a37e43ed5..20f7fe1c1f6900cbf22ccab949d9b0c5f47af434 100755 (executable)
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -36,7 +36,6 @@
  
      <!-- Endpoints -->
      <!-- <load module="mod_dingaling"/> -->
-    <!-- <load module="mod_portaudio"/> -->
      <!-- <load module="mod_alsa"/> -->
      <load module="mod_sofia"/>
      <load module="mod_loopback"/>
diff --git a/conf/vanilla/autoload_configs/portaudio.conf.xml b/conf/vanilla/autoload_configs/portaudio.conf.xml

deleted file mode 100644 (file)

index a715571..0000000
--- a/conf/vanilla/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev: 
-        partial case sensitive string match on something in the name 
-        or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-    <!--Enable or Disable dual_streams-->
-    <!--<param name="dual-streams" value="true"/>-->
-
-    <!--file to play when calls are on hold-->
-    <param name="hold-file" value="$${hold_music}"/>
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="48000"/>
-    <param name="codec-ms" value="20"/>
-
-    <!--uncomment the following line to make mod_portaudio fail to load if it fails to find a device-->
-    <!-- <param name="unload-on-device-fail" value="true"/> -->
-  </settings>
-
-  <!-- 
-       mod_portaudio "streams"
-
-       The portaudio streams were introduced to support multiple devices and multiple channels in mod_portaudio.
-       For example, if you have a sound card that supports multiple channels or have multiple sound cards and you
-       want to use them at the same time, you can do it configuring streams and endpoints here.
-
-       A "stream" is just a logical container for some settings required by portaudio in order to stream audio and
-       define a friendly name for that configuration. Streams in itself do not do anything else than contain configs. 
-       Once you have your streams defined you can proceed to define "endpoints". Go to the "<endpoints>" section 
-       for more information on endpoints.
-
-       You can use the command "pa shstreams" (portaudio shared streams) to show the configured streams.
-  -->
-  <streams>
-       <!--
-       In this example we define 2 streams, one for a usb audio device and another for the usual Mac defaults
-       The name="" attribute in the <stream> tag must uniquely identify the stream configuration and can be
-       later used when creating endpoints in the "instream" and "outstream" parameters of the endpoint.
-       -->
-
-       <!-- This sample "usb1" configuration was tested with a USB Griffin iMic device -->
-       <stream name="usb1">
-               <!-- 
-                       Which device to use for input in this stream 
-                       The value for this parameter must be either in the form '#devno', 
-                       for example '#2' for device number 2, or 'device-name', like 'iMic USB audio system'
-                       The output of command "pa devlist" will show you device names and numbers as enumerated
-                       by portaudio.
-               -->
-               <param name="indev" value="#2" />
-
-               <!-- 
-                       Same as the indev but for output. In this case the device is capable of input and output
-                       Some devices are capable of input only or output only (see the default example)
-               -->
-               <param name="outdev" value="#2" />
-
-               <!-- The sample rate to use for this stream -->
-               <param name="sample-rate" value="48000" />
-
-               <!-- 
-                       Size of the packets in milliseconds. The smaller the number the less latency you'll have
-                       The minimum value is 10ms 
-               -->
-               <param name="codec-ms" value="10" />
-
-               <!-- 
-                       How many channels to open for this stream.
-                       If you're device is stereo, you can choose 2 here. However, bear in mind that then
-                       your left and right channels will be separated and when creating endpoints you will have
-                       to either choose the left or right channel. This may or may not be what you want. This separation
-                       means that you can have 2 separate FreeSWITCH calls, listening to one of them in your left channel
-                       and the other in the right chanel.
-               -->
-               <param name="channels" value="2" />
-       </stream>
-
-       <!-- This default stream was tested using the default Macbook Pro input/output devices -->
-       <stream name="default">
-               <!-- The default system input device -->
-               <param name="indev" value="#0" />
-               <!-- The default system output device -->
-               <param name="outdev" value="#1" />
-               <!-- CD quality sampling rate ftw -->
-               <param name="sample-rate" value="48000" />
-               <!-- Low latency -->
-               <param name="codec-ms" value="10" />
-               <!-- Choosing 1 channel allows to hear in both left-right channel when using a headset -->
-               <param name="channels" value="1" />
-       </stream>
-  </streams>
-
-  <!-- 
-       mod_portaudio "endpoints"
-
-       Endpoints is a way to define the input and output that a given portaudio channel will use.
-       There is a lot of flexibility. You can create endpoints which are "send-only", which means
-       audio will be read from FreeSWITCH and sent down to the provided stream, but no audio will
-       be read from that stream and only silence provided back to FreeSWITCH.
-
-               send-only endpoint:
-                       (FS CORE) ->-> audio ->-> sound-card-x
-
-       You can also create a read-only endpoint.
-
-               read-only-endpoint:
-                       (FS CORE) <-<- audio <-<- sound-card-x
-
-       And of course you can create a bidirectional endpoint:
-               bidirectional-endpoint:
-                       (FS CORE) <-> audio <-> sound-card-x
-
-       You can also define a stream which uses only the left or only the right channel of a given device stream.
-       This means you can have 2 SIP calls connected to the same device haring one call in your left ear and
-       the other call to your right ear :-)
-
-       The name="parameter" of the endpoint allows you to use it in the FreeSWITCH dial plan to dial, ie:
-
-       <action application="bridge" data="portaudio/endpoint/usb1out-left" />
-
-       You can use the command "pa endpoints" to show the configured endpoints.
-  -->
-  <endpoints>
-
-       <!-- 
-               An endpoint is a handle name to refer to a configuration that determines where to read media from 
-               and write media to. The endpoint can use any input/output stream combination for that purpose as 
-               long as the streams match the sampling rate and codec-ms (see <streams> XML tag).
-               You can also omit the instream or the outstream parameter (but obviously not both).
-       -->
-
-       <!-- 
-               Configuration for a "default" bidirectional endpoint that uses the default stream defined previously in
-               the <streams> section.
-        -->
-       <endpoint name="default">
-               <!-- 
-                       The instream, outstream is the name of the stream and channel to use. The stream
-                       name is the same you configured in the <streams> section. This parameters follow 
-                       the syntax <stream-name>:<channel index>. You can omit either the outstream
-                       or the instream, but not both! The channel index is zero-based and must be consistent 
-                       with the number of channels available for that stream (as configured in the <stream> section).
-                       You cannot use index 1 if you chose channels=1 in the stream configuration.
-               -->
-               <param name="instream" value="default:0" />
-               <param name="outstream" value="default:0" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'send-only' or 'output-only' and uses the channel index 0 (left channel in a stereo device) 
-       -->
-       <endpoint name="usb1out-left">
-               <param name="outstream" value="usb1:0" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'send-only' or 'output-only' and uses the channel index 1 (right channel in a stereo device) 
-       -->
-       <endpoint name="usb1out-right">
-               <param name="outstream" value="usb1:1" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'receive-only' or 'input-only' and uses the channel index 0 (left channel in a stereo device) 
-       -->
-       <endpoint name="usb1in-left">
-               <param name="instream" value="usb1:0" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'receive-only' or 'input-only' and uses the channel index 1 (right channel in a stereo device) 
-       -->
-       <endpoint name="usb1in-right">
-               <param name="instream" value="usb1:1" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'bidirectional' or 'send-receive' and uses the channel index 0 (left channel in a stereo device) 
-       -->
-       <endpoint name="usb1-left">
-               <param name="instream" value="usb1:0" />
-               <param name="outstream" value="usb1:0" />
-       </endpoint>
-
-       <!-- 
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'bidirectional' or 'send-receive' and uses the channel index 1 (right channel in a stereo device) 
-       -->
-       <endpoint name="usb1-right">
-               <param name="instream" value="usb1:1" />
-               <param name="outstream" value="usb1:1" />
-       </endpoint>
-
-  </endpoints>
-
-</configuration>
-
diff --git a/conf/vanilla/dialplan/default.xml b/conf/vanilla/dialplan/default.xml

index c3edafc1c808647134d2d8e9e57ee58b8d389c6d..fb999d54ac6537f570a1b1d1eb2bde3c394f72d8 100644 (file)
--- a/conf/vanilla/dialplan/default.xml
+++ b/conf/vanilla/dialplan/default.xml
@@ -340,16 +340,6 @@
        </condition>
      </extension>
  
-    <!--
-        This extension is used by mod_portaudio so you can pa call sip:someone@example.com
-        mod_portaudio will pass the entire string to the dialplan for routing.
-    -->
-    <extension name="sip_uri">
-      <condition field="destination_number" expression="^sip:(.*)$">
-       <action application="bridge" data="sofia/${use_profile}/$1"/>
-      </condition>
-    </extension>
-
      <!--
         start a dynamic conference with the settings of the "default" conference profile in conference.conf.xml
      -->
diff --git a/configure.ac b/configure.ac

index 139ff97358a27f49400e77abdf1748bd6abfc8d9..e56bc72e9d3d7007e623594d6e812a79baf1988c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1261,7 +1261,6 @@ case $host in
          path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
          path_push_unique PKG_CONFIG_PATH /usr/local/opt/sqlite/lib/pkgconfig/
          path_push_unique PKG_CONFIG_PATH /usr/local/opt/ldns/lib/pkgconfig/
-        path_push_unique PKG_CONFIG_PATH /usr/local/opt/portaudio/lib/pkgconfig/
          path_push_unique PKG_CONFIG_PATH /usr/local/opt/ffmpeg/lib/pkgconfig/
         ;;
  esac
@@ -1328,9 +1327,6 @@ PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1])
  PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.4],[
    AM_CONDITIONAL([HAVE_YAML],[true])],[
    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_YAML],[false])])
-PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19],[
-  AM_CONDITIONAL([HAVE_PORTAUDIO],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_PORTAUDIO],[false])])
  PKG_CHECK_MODULES([LDNS], [libldns-fs >= 1.6.6],[
    AM_CONDITIONAL([HAVE_LDNS],[true])],[
  PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[
@@ -2182,7 +2178,6 @@ AC_CONFIG_FILES([Makefile
                 src/mod/endpoints/mod_khomp/Makefile
                 src/mod/endpoints/mod_loopback/Makefile
                 src/mod/endpoints/mod_opal/Makefile
-               src/mod/endpoints/mod_portaudio/Makefile
                 src/mod/endpoints/mod_reference/Makefile
                 src/mod/endpoints/mod_rtmp/Makefile
                 src/mod/endpoints/mod_skinny/Makefile
@@ -2217,7 +2212,6 @@ AC_CONFIG_FILES([Makefile
                 src/mod/formats/mod_sndfile/Makefile
                 src/mod/formats/mod_tone_stream/Makefile
                 src/mod/formats/mod_vlc/Makefile
-               src/mod/formats/mod_portaudio_stream/Makefile
                 src/mod/languages/mod_java/Makefile
                 src/mod/languages/mod_lua/Makefile
                 src/mod/languages/mod_managed/Makefile
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh

index 37cc2fe0c35de61c937d98e9609567e654a80487..d3a00c7071b6bc47f405471648349d318513b82f 100755 (executable)
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -658,7 +658,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
   freeswitch-mod-dialplan-directory (= \${binary:Version}),
   freeswitch-mod-dialplan-xml (= \${binary:Version}),
   freeswitch-mod-loopback (= \${binary:Version}),
- freeswitch-mod-portaudio (= \${binary:Version}),
   freeswitch-mod-rtc (= \${binary:Version}),
   freeswitch-mod-rtmp (= \${binary:Version}),
   freeswitch-mod-skinny (= \${binary:Version}),
@@ -674,7 +673,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
   freeswitch-mod-snmp (= \${binary:Version}),
   freeswitch-mod-local-stream (= \${binary:Version}),
   freeswitch-mod-native-file (= \${binary:Version}),
- freeswitch-mod-portaudio-stream (= \${binary:Version}),
   freeswitch-mod-shell-stream (= \${binary:Version}),
   freeswitch-mod-sndfile (= \${binary:Version}),
   freeswitch-mod-tone-stream (= \${binary:Version}),
@@ -892,7 +890,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
   freeswitch-mod-dialplan-directory-dbg (= \${binary:Version}),
   freeswitch-mod-dialplan-xml-dbg (= \${binary:Version}),
   freeswitch-mod-loopback-dbg (= \${binary:Version}),
- freeswitch-mod-portaudio-dbg (= \${binary:Version}),
   freeswitch-mod-rtc-dbg (= \${binary:Version}),
   freeswitch-mod-rtmp-dbg (= \${binary:Version}),
   freeswitch-mod-skinny-dbg (= \${binary:Version}),
@@ -908,7 +905,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
   freeswitch-mod-snmp-dbg (= \${binary:Version}),
   freeswitch-mod-local-stream-dbg (= \${binary:Version}),
   freeswitch-mod-native-file-dbg (= \${binary:Version}),
- freeswitch-mod-portaudio-stream-dbg (= \${binary:Version}),
   freeswitch-mod-shell-stream-dbg (= \${binary:Version}),
   freeswitch-mod-sndfile-dbg (= \${binary:Version}),
   freeswitch-mod-tone-stream-dbg (= \${binary:Version}),
diff --git a/debian/control-modules b/debian/control-modules

index afcf1e23e947d6b7ec4a3725b6839826b163a355..b11dc100059082300b9c5147ee2e9fee27a5f68b 100755 (executable)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -427,11 +427,6 @@ Description: mod_opal
   Adds mod_opal.
  Build-Depends: libopal-dev
  
-Module: endpoints/mod_portaudio
-Description: mod_portaudio
- Adds mod_portaudio.
-Build-Depends: portaudio19-dev
-
  Module: endpoints/mod_reference
  Description: mod_reference
   Adds mod_reference.
@@ -554,11 +549,6 @@ Module: formats/mod_png
  Description: Adds mod_png
   Adds mod_png.
  
-Module: formats/mod_portaudio_stream
-Description: mod_portaudio_stream
- Adds mod_portaudio_stream.
-Build-Depends: portaudio19-dev
-
  Module: formats/mod_shell_stream
  Description: mod_shell_stream
   Adds mod_shell_stream.
diff --git a/debian/copyright b/debian/copyright

index 18b2f92ddcacf7d9bc3759cf6e9d5fbe1d63032d..0165760810f51abbe9fd349ac94b5d91618a3c3c 100755 (executable)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1533,15 +1533,6 @@ Files: src/mod/endpoints/mod_skinny/*.p[lm]
  Copyright: 2010, Mathieu Parent <math.parent@gmail.com>
  License: Perl
  
-Files: src/mod/endpoints/mod_portaudio/*
-Copyright: 1999-2000 Ross Bencina and Phil Burk
- 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
-Files: src/mod/endpoints/mod_portaudio/mod_portaudio.c
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
-License: MPL-1.1
-
  Files: src/mod/endpoints/mod_sofia/sip-dig.c
  Copyright: 2006 Nokia Corporation
  License: LGPL-2.1+
diff --git a/freeswitch.spec b/freeswitch.spec

index aa897fd9a971c43d85566fc0b8e42c5beb3c5445..773b8784c788ca9bc514a3c6233d3bdeb4158558 100755 (executable)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -827,17 +827,6 @@ PostgreSQL native support for FreeSWITCH.
  #%description endpoint-khomp
  #Khomp hardware endpoint support for FreeSWITCH open source telephony platform.
  
-%package endpoint-portaudio
-Summary:        PortAudio endpoint support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:      alsa-lib
-BuildRequires: alsa-lib-devel
-BuildRequires: portaudio-devel
-
-%description endpoint-portaudio
-PortAudio endpoint support for FreeSWITCH open source telephony platform.
-
  %package endpoint-rtmp
  Summary:        RTPM Endpoint support for FreeSWITCH open source telephony platform
  Group:          System/Libraries
@@ -1001,15 +990,6 @@ transcoding is necessary. The default FreeSWITCH sound files are in wav format.
  Generally, these require transcoding when being played to callers. However, if
  a native format sound file is available then FreeSWITCH can use it. 
  
-%package format-portaudio-stream
-Summary:       PortAudio Media Steam support for the FreeSWITCH open source telephony platform
-Group:         System/Libraries
-Requires:      %{name} = %{version}-%{release}
-BuildRequires: portaudio-devel
-
-%description format-portaudio-stream
-Portaudio Streaming interface Audio for FreeSWITCH
-
  %package format-shell-stream
  Summary:       Implements Media Steaming from arbitrary shell commands for the FreeSWITCH open source telephony platform
  Group:         System/Libraries
@@ -1288,7 +1268,6 @@ Requires: freeswitch-codec-siren
  Requires:      freeswitch-database-pgsql
  Requires:      freeswitch-format-local-stream
  Requires:      freeswitch-format-native-file
-Requires:      freeswitch-format-portaudio-stream
  Requires:      freeswitch-format-tone-stream
  Requires:      freeswitch-lang-en
  
@@ -1403,7 +1382,7 @@ DIRECTORIES_MODULES=""
  #
  ######################################################################################################################
  ENDPOINTS_MODULES=" \
-                       endpoints/mod_loopback endpoints/mod_portaudio endpoints/mod_rtmp \
+                       endpoints/mod_loopback endpoints/mod_rtmp \
                         endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia"
  
  ## DISABLED MODULES DUE TO BUILD ISSUES endpoints/mod_h323 endpoints/mod_khomp 
@@ -1424,7 +1403,7 @@ EVENT_HANDLERS_MODULES="event_handlers/mod_cdr_csv event_handlers/mod_cdr_pg_csv
  #                                      File and Audio Format Handlers
  #
  ######################################################################################################################
-FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_opusfile formats/mod_portaudio_stream \
+FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_opusfile \
                   formats/mod_shell_stream formats/mod_shout formats/mod_sndfile formats/mod_tone_stream"
  
  ######################################################################################################################
@@ -1845,7 +1824,6 @@ fi
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/oreka.conf.xml
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/osp.conf.xml
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pocketsphinx.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/portaudio.conf.xml
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/post_load_modules.conf.xml
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pre_load_modules.conf.xml
  %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/presence_map.conf.xml
@@ -2146,9 +2124,6 @@ fi
  #%files endpoint-khomp
  #%{MODINSTDIR}/mod_khomp.so*
  
-%files endpoint-portaudio
-%{MODINSTDIR}/mod_portaudio.so*
-
  %files endpoint-rtmp
  %{MODINSTDIR}/mod_rtmp.so*
  
@@ -2213,9 +2188,6 @@ fi
  %files format-opusfile
  %{MODINSTDIR}/mod_opusfile.so*
  
-%files format-portaudio-stream
-%{MODINSTDIR}/mod_portaudio_stream.so*
-
  %files format-shell-stream
  %{MODINSTDIR}/mod_shell_stream.so*
  
diff --git a/libs/.gitignore b/libs/.gitignore

index 77e312f88b5b1746e426a3bb8e6fbf755edb65f8..d4d419affc980c0f8ac061160a95263067d66bb7 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -592,8 +592,6 @@ srtp/build/compile
  /sqlite-*/
  /sqlite/
  /ldns/
-/portaudio/
-portaudio.*.log
  apr/configure
  libyuv/Makefile
  libyuv/convert
diff --git a/libs/win32/portaudio/portaudio.2017.vcxproj b/libs/win32/portaudio/portaudio.2017.vcxproj

deleted file mode 100644 (file)

index 05445a6..0000000
--- a/libs/win32/portaudio/portaudio.2017.vcxproj
+++ /dev/null
@@ -1,859 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug DirectSound|Win32">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug DirectSound|x64">
-      <Configuration>Debug DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|Win32">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release DirectSound|x64">
-      <Configuration>Release DirectSound</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>portaudio</ProjectName>
-    <ProjectGuid>{0A18A071-125E-442F-AFF7-A3F68ABECF99}</ProjectGuid>
-    <RootNamespace>portaudio</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\w32\download_portaudio.props" Condition=" '$(downloadportaudioPropsImported)' == '' " />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;PAWIN_USE_WDMKS_DEVICE_INFO;PAWIN_WDMKS_NO_KSGUID_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\portaudio\src\common;..\..\portaudio\include;.\;..\..\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_USE_DS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>4996;4312;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\portaudio\src\common\pa_allocation.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_cpuload.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_debugprint.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_dither.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_front.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_process.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\common\pa_trace.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\pa_asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\asio.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\combase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\asio\ASIOSDK\common\register.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\portaudio\src\hostapi\asio\ASIOSDK\host;..\..\portaudio\src\hostapi\asio\ASIOSDK\host\pc;..\..\portaudio\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\dsound\pa_win_ds_dynlink.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\skeleton\pa_hostapi_skeleton.c" />
-    <ClCompile Include="..\..\portaudio\src\hostapi\wmme\pa_win_wmme.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\hostapi\wasapi\pa_win_wasapi.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_coinitialize.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_hostapis.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_util.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_waveformat.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_win_wdmks_utils.c" />
-    <ClCompile Include="..\..\portaudio\src\os\win\pa_x86_plain_converters.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release DirectSound|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="portaudio.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/src/mod/.gitignore b/src/mod/.gitignore

index 7284fb6176e17cb73635e22aef1c29d2c6d53087..47f1a92e0b6ac5e23d90ebb55eee0301067d51ac 100644 (file)
--- a/src/mod/.gitignore
+++ b/src/mod/.gitignore
@@ -33,9 +33,6 @@
  /codecs/mod_vp8/Makefile
  /dialplans/mod_dialplan_asterisk/Makefile
  /dialplans/mod_dialplan_xml/Makefile
-/endpoints/mod_portaudio/Makefile
-/endpoints/mod_portaudio/Makefile.in
-/endpoints/mod_portaudio/mod_portaudio.log
  /endpoints/mod_skinny/Makefile
  /endpoints/mod_skinny/Makefile.in
  /endpoints/mod_skinny/mod_skinny.log
@@ -45,9 +42,6 @@
  /event_handlers/mod_erlang_event/Makefile
  /event_handlers/mod_event_socket/Makefile
  /formats/mod_native_file/Makefile
-/formats/mod_portaudio_stream/Makefile
-/formats/mod_portaudio_stream/Makefile.in
-/formats/mod_portaudio_stream/mod_portaudio_stream.log
  /formats/mod_tone_stream/Makefile
  /languages/mod_java/Makefile
  /languages/mod_java/classes/
diff --git a/src/mod/endpoints/mod_portaudio/Makefile.am b/src/mod/endpoints/mod_portaudio/Makefile.am

deleted file mode 100644 (file)

index 06ba6f6..0000000
--- a/src/mod/endpoints/mod_portaudio/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_portaudio
-
-if HAVE_PORTAUDIO
-mod_LTLIBRARIES = mod_portaudio.la
-mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
-mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_la_CPPFLAGS = -I. $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
-mod_portaudio_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
-mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-if ISMAC
-mod_portaudio_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
-endif
-else
-install: error
-all: error
-error:
-       $(error You must install portaudio19-dev to build $(MODNAME))
-endif
diff --git a/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml b/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml

deleted file mode 100644 (file)

index b11725a..0000000
--- a/src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<configuration name="portaudio.conf" description="Soundcard Endpoint">
-  <settings>
-    <!-- indev, outdev, ringdev:
-        partial case sensitive string match on something in the name
-        or the device number prefixed with # eg "#1" (or blank for default) -->
-
-    <!-- device to use for input -->
-    <param name="indev" value=""/>
-    <!-- device to use for output -->
-    <param name="outdev" value=""/>
-
-    <!--device to use for inbound ring -->
-    <!--<param name="ringdev" value=""/>-->
-    <!--File to play as the ring sound -->
-    <!--<param name="ring-file" value="/sounds/ring.wav"/>-->
-    <!--Number of seconds to pause between rings -->
-    <!--<param name="ring-interval" value="5"/>-->
-    <!--Enable or Disable dual_streams-->
-    <!--<param name="dual-streams" value="true"/>-->
-
-    <!--file to play when calls are on hold-->
-    <param name="hold-file" value="$${hold_music}"/>
-    <!--Timer to use for hold music (i'd leave this one commented)-->
-    <!--<param name="timer-name" value="soft"/>-->
-
-    <!--Default dialplan and caller-id info -->
-    <param name="dialplan" value="XML"/>
-    <param name="cid-name" value="$${outbound_caller_name}"/>
-    <param name="cid-num" value="$${outbound_caller_id}"/>
-
-    <!--audio sample rate and interval -->
-    <param name="sample-rate" value="48000"/>
-    <param name="codec-ms" value="20"/>
-
-    <!--uncomment the following line to make mod_portaudio fail to load if it fails to find a device-->
-    <!-- <param name="unload-on-device-fail" value="true"/> -->
-  </settings>
-
-  <!--
-       mod_portaudio "streams"
-
-       The portaudio streams were introduced to support multiple devices and multiple channels in mod_portaudio.
-       For example, if you have a sound card that supports multiple channels or have multiple sound cards and you
-       want to use them at the same time, you can do it configuring streams and endpoints here.
-
-       A "stream" is just a logical container for some settings required by portaudio in order to stream audio and
-       define a friendly name for that configuration. Streams in itself do not do anything else than contain configs.
-       Once you have your streams defined you can proceed to define "endpoints". Go to the "<endpoints>" section
-       for more information on endpoints.
-
-       You can use the command "pa shstreams" (portaudio shared streams) to show the configured streams.
-  -->
-  <streams>
-       <!--
-       In this example we define 2 streams, one for a usb audio device and another for the usual Mac defaults
-       The name="" attribute in the <stream> tag must uniquely identify the stream configuration and can be
-       later used when creating endpoints in the "instream" and "outstream" parameters of the endpoint.
-       -->
-
-       <!-- This sample "usb1" configuration was tested with a USB Griffin iMic device -->
-       <stream name="usb1">
-               <!--
-                       Which device to use for input in this stream
-                       The value for this parameter must be either in the form '#devno',
-                       for example '#2' for device number 2, or 'device-name', like 'iMic USB audio system'
-                       The output of command "pa devlist" will show you device names and numbers as enumerated
-                       by portaudio.
-               -->
-               <param name="indev" value="#2" />
-
-               <!--
-                       Same as the indev but for output. In this case the device is capable of input and output
-                       Some devices are capable of input only or output only (see the default example)
-               -->
-               <param name="outdev" value="#2" />
-
-               <!-- The sample rate to use for this stream -->
-               <param name="sample-rate" value="48000" />
-
-               <!--
-                       Size of the packets in milliseconds. The smaller the number the less latency you'll have
-                       The minimum value is 10ms
-               -->
-               <param name="codec-ms" value="10" />
-
-               <!--
-                       How many channels to open for this stream.
-                       If you're device is stereo, you can choose 2 here. However, bear in mind that then
-                       your left and right channels will be separated and when creating endpoints you will have
-                       to either choose the left or right channel. This may or may not be what you want. This separation
-                       means that you can have 2 separate FreeSWITCH calls, listening to one of them in your left channel
-                       and the other in the right chanel.
-               -->
-               <param name="channels" value="2" />
-       </stream>
-
-       <!-- This default stream was tested using the default Macbook Pro input/output devices -->
-       <stream name="default">
-               <!-- The default system input device -->
-               <param name="indev" value="#0" />
-               <!-- The default system output device -->
-               <param name="outdev" value="#1" />
-               <!-- CD quality sampling rate ftw -->
-               <param name="sample-rate" value="48000" />
-               <!-- Low latency -->
-               <param name="codec-ms" value="10" />
-               <!-- Choosing 1 channel allows to hear in both left-right channel when using a headset -->
-               <param name="channels" value="1" />
-       </stream>
-  </streams>
-
-  <!--
-       mod_portaudio "endpoints"
-
-       Endpoints is a way to define the input and output that a given portaudio channel will use.
-       There is a lot of flexibility. You can create endpoints which are "send-only", which means
-       audio will be read from FreeSWITCH and sent down to the provided stream, but no audio will
-       be read from that stream and only silence provided back to FreeSWITCH.
-
-               send-only endpoint:
-                       (FS CORE) ->-> audio ->-> sound-card-x
-
-       You can also create a read-only endpoint.
-
-               read-only-endpoint:
-                       (FS CORE) <-<- audio <-<- sound-card-x
-
-       And of course you can create a bidirectional endpoint:
-               bidirectional-endpoint:
-                       (FS CORE) <-> audio <-> sound-card-x
-
-       You can also define a stream which uses only the left or only the right channel of a given device stream.
-       This means you can have 2 SIP calls connected to the same device haring one call in your left ear and
-       the other call to your right ear :-)
-
-       The name="parameter" of the endpoint allows you to use it in the FreeSWITCH dial plan to dial, ie:
-
-       <action application="bridge" data="portaudio/endpoint/usb1out-left" />
-
-       You can use the command "pa endpoints" to show the configured endpoints.
-  -->
-  <endpoints>
-
-       <!--
-               An endpoint is a handle name to refer to a configuration that determines where to read media from
-               and write media to. The endpoint can use any input/output stream combination for that purpose as
-               long as the streams match the sampling rate and codec-ms (see <streams> XML tag).
-               You can also omit the instream or the outstream parameter (but obviously not both).
-       -->
-
-       <!--
-               Configuration for a "default" bidirectional endpoint that uses the default stream defined previously in
-               the <streams> section.
-        -->
-       <endpoint name="default">
-               <!--
-                       The instream, outstream is the name of the stream and channel to use. The stream
-                       name is the same you configured in the <streams> section. This parameters follow
-                       the syntax <stream-name>:<channel index>. You can omit either the outstream
-                       or the instream, but not both! The channel index is zero-based and must be consistent
-                       with the number of channels available for that stream (as configured in the <stream> section).
-                       You cannot use index 1 if you chose channels=1 in the stream configuration.
-               -->
-               <param name="instream" value="default:0" />
-               <param name="outstream" value="default:0" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'send-only' or 'output-only' and uses the channel index 0 (left channel in a stereo device)
-       -->
-       <endpoint name="usb1out-left">
-               <param name="outstream" value="usb1:0" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'send-only' or 'output-only' and uses the channel index 1 (right channel in a stereo device)
-       -->
-       <endpoint name="usb1out-right">
-               <param name="outstream" value="usb1:1" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'receive-only' or 'input-only' and uses the channel index 0 (left channel in a stereo device)
-       -->
-       <endpoint name="usb1in-left">
-               <param name="instream" value="usb1:0" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'receive-only' or 'input-only' and uses the channel index 1 (right channel in a stereo device)
-       -->
-       <endpoint name="usb1in-right">
-               <param name="instream" value="usb1:1" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'bidirectional' or 'send-receive' and uses the channel index 0 (left channel in a stereo device)
-       -->
-       <endpoint name="usb1-left">
-               <param name="instream" value="usb1:0" />
-               <param name="outstream" value="usb1:0" />
-       </endpoint>
-
-       <!--
-               This endpoint uses the USB stream defined previously in the <streams> section and
-               is 'bidirectional' or 'send-receive' and uses the channel index 1 (right channel in a stereo device)
-       -->
-       <endpoint name="usb1-right">
-               <param name="instream" value="usb1:1" />
-               <param name="outstream" value="usb1:1" />
-       </endpoint>
-
-  </endpoints>
-
-</configuration>
-
diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj

deleted file mode 100644 (file)

index 42d6cee..0000000
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>mod_PortAudio</ProjectName>
-    <ProjectGuid>{5FD31A25-5D83-4794-8BEE-904DAD84CE71}</ProjectGuid>
-    <RootNamespace>mod_PortAudio</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\portaudio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ALLOW_SMP_DANGERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DisableSpecificWarnings>4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ksuser.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\portaudio\winvc\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_PortAudio.c">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6011;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ClCompile Include="pa_ringbuffer.c" />
-    <ClCompile Include="pablio.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pa_ringbuffer.h" />
-    <ClInclude Include="pablio.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\win32\apr\libapr.2017.vcxproj">
-      <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\libs\win32\portaudio\portaudio.2017.vcxproj">
-      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c

deleted file mode 100644 (file)

index acd578e..0000000
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ /dev/null
@@ -1,3312 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License `
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- * Moises Silva <moises.silva@gmail.com> (Multiple endpoints work sponsored by Comrex Corporation)
- * Raymond Chandler <intralanman@freeswitch.org>
- *
- *
- * mod_portaudio.c -- PortAudio Endpoint Module
- *
- */
-
-#include "switch.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pablio.h"
-
-#define MY_EVENT_RINGING "portaudio::ringing"
-#define MY_EVENT_MAKE_CALL "portaudio::makecall"
-#define MY_EVENT_CALL_HELD "portaudio::callheld"
-#define MY_EVENT_CALL_RESUMED "portaudio::callresumed"
-#define MY_EVENT_ERROR_AUDIO_DEV "portaudio::audio_dev_error"
-#define SWITCH_PA_CALL_ID_VARIABLE "pa_call_id"
-
-#define MIN_STREAM_SAMPLE_RATE 8000
-#define STREAM_SAMPLES_PER_PACKET(stream) ((stream->codec_ms * stream->sample_rate) / 1000)
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_shutdown);
-//SWITCH_MODULE_RUNTIME_FUNCTION(mod_portaudio_runtime);
-SWITCH_MODULE_DEFINITION(mod_portaudio, mod_portaudio_load, mod_portaudio_shutdown, NULL);
-
-static switch_memory_pool_t *module_pool = NULL;
-switch_endpoint_interface_t *portaudio_endpoint_interface;
-
-#define SAMPLE_TYPE  paInt16
-typedef int16_t SAMPLE;
-
-typedef switch_status_t (*pa_command_t) (char **argv, int argc, switch_stream_handle_t *stream);
-
-typedef enum {
-       GFLAG_NONE = 0,
-       GFLAG_EAR = (1 << 0),
-       GFLAG_MOUTH = (1 << 1),
-       GFLAG_RING = (1 << 2)
-} GFLAGS;
-
-typedef enum {
-       TFLAG_IO = (1 << 0),
-       TFLAG_INBOUND = (1 << 1),
-       TFLAG_OUTBOUND = (1 << 2),
-       TFLAG_DTMF = (1 << 3),
-       TFLAG_VOICE = (1 << 4),
-       TFLAG_HANGUP = (1 << 5),
-       TFLAG_LINEAR = (1 << 6),
-       TFLAG_ANSWER = (1 << 7),
-       TFLAG_HUP = (1 << 8),
-       TFLAG_MASTER = (1 << 9),
-       TFLAG_AUTO_ANSWER = (1 << 10)
-} TFLAGS;
-
-struct audio_stream {
-       int indev;
-       int outdev;
-       PABLIO_Stream *stream;
-       switch_timer_t write_timer;
-       struct audio_stream *next;
-};
-typedef struct audio_stream audio_stream_t;
-
-/* Audio stream that can be shared across endpoints */
-typedef struct _shared_audio_stream_t {
-       /*! Friendly name for this stream */
-       char name[255];
-       /*! Sampling rate */
-       int sample_rate;
-       /*! Buffer packetization (and therefore timing) */
-       int codec_ms;
-       /*! The PA input device */
-       int indev;
-       /*! Input channels being used */
-       uint8_t inchan_used[MAX_IO_CHANNELS];
-       /*! The PA output device */
-       int outdev;
-       /*! Output channels being used */
-       uint8_t outchan_used[MAX_IO_CHANNELS];
-       /*! How many channels to create (for both indev and outdev) */
-       int channels;
-       /*! The io stream helper to buffer audio */
-       PABLIO_Stream *stream;
-       /* It can be shared after all :-)  */
-       switch_mutex_t *mutex;
-} shared_audio_stream_t;
-
-typedef struct private_object private_t;
-/* Endpoint that can be called via portaudio/endpoint/<endpoint-name> */
-typedef struct _audio_endpoint {
-       /*! Friendly name for this endpoint */
-       char name[255];
-
-       /*! Input stream for this endpoint */
-       shared_audio_stream_t *in_stream;
-
-       /*! Output stream for this endpoint */
-       shared_audio_stream_t *out_stream;
-
-       /*! Channel index within the input stream where we get the audio for this endpoint */
-       int inchan;
-
-       /*! Channel index within the output stream where we get the audio for this endpoint */
-       int outchan;
-
-       /*! Associated private information if involved in a call */
-       private_t *master;
-
-       /*! For timed read and writes */
-       switch_timer_t read_timer;
-       switch_timer_t write_timer;
-
-       /* We need our own read frame */
-       switch_frame_t read_frame;
-       unsigned char read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-
-       /* Needed codecs for the core to read/write in the proper format */
-       switch_codec_t read_codec;
-       switch_codec_t write_codec;
-
-       /*! Let's be safe */
-       switch_mutex_t *mutex;
-} audio_endpoint_t;
-
-struct private_object {
-       unsigned int flags;
-       switch_core_session_t *session;
-       switch_caller_profile_t *caller_profile;
-       char call_id[50];
-       int sample_rate;
-       int codec_ms;
-       switch_mutex_t *flag_mutex;
-       char *hold_file;
-       switch_file_handle_t fh;
-       switch_file_handle_t *hfh;
-       switch_frame_t hold_frame;
-       unsigned char holdbuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-       audio_endpoint_t *audio_endpoint;
-       struct private_object *next;
-};
-
-
-static struct {
-       int debug;
-       int port;
-       char *cid_name;
-       char *cid_num;
-       char *dialplan;
-       char *context;
-       char *ring_file;
-       char *hold_file;
-       char *timer_name;
-       int ringdev;
-       int indev;
-       int outdev;
-       int call_id;
-       int unload_device_fail;
-       switch_hash_t *call_hash;
-       switch_mutex_t *device_lock;
-       switch_mutex_t *pvt_lock;
-       switch_mutex_t *streams_lock;
-       switch_mutex_t *flag_mutex;
-       switch_mutex_t *pa_mutex;
-       int sample_rate;
-       int codec_ms;
-       audio_stream_t *main_stream;
-       audio_stream_t *ring_stream;
-       switch_codec_t read_codec;
-       switch_codec_t write_codec;
-       switch_frame_t read_frame;
-       switch_frame_t cng_frame;
-       unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-       unsigned char cngbuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-       private_t *call_list;
-       audio_stream_t *stream_list;
-       /*! Streams that can be used by multiple endpoints at the same time */
-       switch_hash_t *sh_streams;
-       /*! Endpoints configured */
-       switch_hash_t *endpoints;
-       int ring_interval;
-       GFLAGS flags;
-       switch_timer_t read_timer;
-       switch_timer_t readfile_timer;
-       switch_timer_t hold_timer;
-       int dual_streams;
-       time_t deactivate_timer;
-       int live_stream_switch;
-       int no_auto_resume_call;
-       int no_ring_during_call;
-       int codecs_inited;
-       int stream_in_use; //only really used by playdev
-       int destroying_streams;
-} globals;
-
-
-#define PA_MASTER 1
-#define PA_SLAVE 0
-
-
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_name, globals.cid_name);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_num, globals.cid_num);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ring_file, globals.ring_file);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_hold_file, globals.hold_file);
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_timer_name, globals.timer_name);
-#define is_master(t) switch_test_flag(t, TFLAG_MASTER)
-
-static void add_pvt(private_t *tech_pvt, int master);
-static void remove_pvt(private_t *tech_pvt);
-static switch_status_t channel_on_init(switch_core_session_t *session);
-static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_destroy(switch_core_session_t *session);
-static switch_status_t channel_on_routing(switch_core_session_t *session);
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-                                                                                                       switch_caller_profile_t *outbound_profile,
-                                                                                                       switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-                                                                                                       switch_call_cause_t *cancel_cause);
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
-
-static switch_status_t create_codecs(int restart);
-static void create_hold_event(private_t *tech_pvt, int unhold);
-static audio_stream_t * find_audio_stream(int indev, int outdev, int already_locked);
-static audio_stream_t * get_audio_stream(int indev, int outdev);
-static audio_stream_t * create_audio_stream(int indev, int outdev);
-PaError open_audio_stream(PABLIO_Stream **stream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters);
-static switch_status_t switch_audio_stream();
-static void add_stream(audio_stream_t *stream, int already_locked);
-static void remove_stream(audio_stream_t *stream, int already_locked);
-static switch_status_t destroy_audio_stream(int indev, int outdev);
-static switch_status_t destroy_actual_stream(audio_stream_t *stream);
-static void destroy_audio_streams();
-static switch_status_t validate_main_audio_stream();
-static switch_status_t validate_ring_audio_stream();
-
-static int dump_info(int verbose);
-static switch_status_t load_config(void);
-static int get_dev_by_name(char *name, int in);
-static int get_dev_by_number(char *numstr, int in);
-SWITCH_STANDARD_API(pa_cmd);
-
-/*
-   State methods they get called when the state changes to the specific state
-   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
-   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
-*/
-static switch_status_t channel_on_init(switch_core_session_t *session)
-{
-       switch_channel_t *channel;
-
-       if (session) {
-               if ((channel = switch_core_session_get_channel(session))) {
-                       switch_channel_set_flag(channel, CF_AUDIO);
-               }
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_routing(switch_core_session_t *session)
-{
-
-       switch_channel_t *channel = switch_core_session_get_channel(session);
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_time_t last;
-       int waitsec = globals.ring_interval * 1000000;
-       switch_file_handle_t fh = { 0 };
-       const char *val, *ring_file = NULL, *hold_file = NULL;
-       int16_t abuf[2048];
-
-       switch_assert(tech_pvt != NULL);
-
-       last = switch_micro_time_now() - waitsec;
-
-       if ((val = switch_channel_get_variable(channel, "pa_hold_file"))) {
-               hold_file = val;
-       } else {
-               hold_file = globals.hold_file;
-       }
-
-       if (hold_file) {
-               tech_pvt->hold_file = switch_core_session_strdup(session, hold_file);
-       }
-       if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
-               if (!tech_pvt->audio_endpoint && validate_main_audio_stream() != SWITCH_STATUS_SUCCESS) {
-                       switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-                       return SWITCH_STATUS_FALSE;
-               }
-
-               if (!tech_pvt->audio_endpoint &&
-                   switch_test_flag(tech_pvt, TFLAG_OUTBOUND) &&
-                   !switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-
-                       add_pvt(tech_pvt, PA_SLAVE);
-
-                       ring_file = globals.ring_file;
-                       if ((val = switch_channel_get_variable(channel, "pa_ring_file"))) {
-                               ring_file = val;
-                       }
-
-                       if (switch_test_flag((&globals), GFLAG_RING)) {
-                               ring_file = NULL;
-                       }
-                       switch_set_flag_locked((&globals), GFLAG_RING);
-                       if (ring_file) {
-                               if (switch_core_file_open(&fh,
-                                                                                 ring_file,
-                                                                                 globals.read_codec.implementation->number_of_channels,
-                                                                                 globals.read_codec.implementation->actual_samples_per_second,
-                                                                                 SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) {
-
-                                       if (validate_ring_audio_stream() != SWITCH_STATUS_SUCCESS) {
-                                               switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-                                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Ring Error!\n");
-                                               switch_core_file_close(&fh);
-                                               return SWITCH_STATUS_GENERR;
-                                       }
-                               } else {
-                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
-                                       ring_file = NULL;
-                               }
-                       }
-               }
-
-               if (tech_pvt->audio_endpoint || switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-                       switch_mutex_lock(globals.pvt_lock);
-                       add_pvt(tech_pvt, PA_MASTER);
-                       if (switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) {
-                               switch_channel_mark_answered(channel);
-                               switch_set_flag(tech_pvt, TFLAG_ANSWER);
-                       }
-                       switch_mutex_unlock(globals.pvt_lock);
-                       switch_yield(1000000);
-               } else {
-                       switch_channel_mark_ring_ready(channel);
-               }
-
-               while (switch_channel_get_state(channel) == CS_ROUTING &&
-                      !switch_channel_test_flag(channel, CF_ANSWERED) &&
-                      !switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
-                       switch_size_t olen = globals.readfile_timer.samples;
-
-                       if (switch_micro_time_now() - last >= waitsec) {
-                               char buf[512];
-                               switch_event_t *event;
-
-                               switch_snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id);
-
-                               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) {
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_info", buf);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", tech_pvt->call_id); /* left behind for backwards compatability */
-                                       switch_channel_set_variable(channel, SWITCH_PA_CALL_ID_VARIABLE, tech_pvt->call_id);
-                                       switch_channel_event_set_data(channel, event);
-                                       switch_event_fire(&event);
-                               }
-                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s\n", buf);
-                               last = switch_micro_time_now();
-                       }
-
-                       if (ring_file) {
-                               if (switch_core_timer_next(&globals.readfile_timer) != SWITCH_STATUS_SUCCESS) {
-                                       switch_core_file_close(&fh);
-                                       break;
-                               }
-                               switch_core_file_read(&fh, abuf, &olen);
-                               if (olen == 0) {
-                                       unsigned int pos = 0;
-                                       switch_core_file_seek(&fh, &pos, 0, SEEK_SET);
-                               }
-
-                               if (globals.ring_stream && (! switch_test_flag(globals.call_list, TFLAG_MASTER) ||
-                                                       ( !globals.no_ring_during_call && globals.main_stream != globals.ring_stream)) ) { //if there is a ring stream and not an active call or if there is an active call and we are allowed to ring during it AND the ring stream is not the main stream
-                                               WriteAudioStream(globals.ring_stream->stream, abuf, (long) olen, 0, &globals.ring_stream->write_timer);
-                               }
-                       } else {
-                               switch_yield(10000);
-                       }
-               }
-               switch_clear_flag_locked((&globals), GFLAG_RING);
-       }
-
-       if (ring_file) {
-               switch_core_file_close(&fh);
-       }
-
-       if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
-               if (!switch_test_flag(tech_pvt, TFLAG_ANSWER) &&
-                   !switch_channel_test_flag(channel, CF_ANSWERED)) {
-                       switch_channel_hangup(channel, SWITCH_CAUSE_NO_ANSWER);
-                       return SWITCH_STATUS_SUCCESS;
-               }
-               switch_set_flag(tech_pvt, TFLAG_ANSWER);
-       }
-
-       switch_set_flag_locked(tech_pvt, TFLAG_IO);
-
-
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n",
-                                         switch_channel_get_name(switch_core_session_get_channel(session)));
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_execute(switch_core_session_t *session)
-{
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n",
-                                         switch_channel_get_name(switch_core_session_get_channel(session)));
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static audio_stream_t* find_audio_stream(int indev, int outdev, int already_locked)
-{
-       audio_stream_t *cur_stream;
-
-       if (! globals.stream_list) {
-               return NULL;
-       }
-
-       if (! already_locked) {
-               switch_mutex_lock(globals.streams_lock);
-       }
-       cur_stream = globals.stream_list;
-
-       while (cur_stream != NULL) {
-               if (cur_stream->outdev == outdev) {
-                       if (indev == -1 || cur_stream->indev == indev) {
-                               if (! already_locked) {
-                                       switch_mutex_unlock(globals.streams_lock);
-                               }
-                               return cur_stream;
-                       }
-               }
-               cur_stream = cur_stream->next;
-       }
-       if (! already_locked) {
-               switch_mutex_unlock(globals.streams_lock);
-       }
-       return NULL;
-}
-
-static void destroy_audio_streams()
-{
-       int close_wait = 4;
-       globals.destroying_streams = 1;
-
-       while (globals.stream_in_use && close_wait--) {
-               switch_yield(250000);
-       }
-       while (globals.stream_list != NULL) {
-               destroy_audio_stream(globals.stream_list->indev, globals.stream_list->outdev);
-       }
-       globals.destroying_streams = 0;
-}
-
-static switch_status_t validate_main_audio_stream()
-{
-       if (globals.read_timer.timer_interface) {
-               switch_core_timer_sync(&globals.read_timer);
-       }
-
-       if (globals.main_stream) {
-               if (globals.main_stream->write_timer.timer_interface) {
-                       switch_core_timer_sync(&(globals.main_stream->write_timer));
-               }
-
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       globals.main_stream = get_audio_stream(globals.indev, globals.outdev);
-
-       if (globals.main_stream) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t validate_ring_audio_stream()
-{
-       if (globals.ringdev == -1) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-       if (globals.ring_stream) {
-               if (globals.ring_stream->write_timer.timer_interface) {
-                       switch_core_timer_sync(&(globals.ring_stream->write_timer));
-               }
-               return SWITCH_STATUS_SUCCESS;
-       }
-       globals.ring_stream = get_audio_stream(-1, globals.ringdev);
-       if (globals.ring_stream) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       return SWITCH_STATUS_FALSE;
-}
-
-static switch_status_t destroy_actual_stream(audio_stream_t *stream)
-{
-       if (stream == NULL) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (globals.main_stream == stream) {
-               globals.main_stream = NULL;
-       }
-
-       if (globals.ring_stream == stream) {
-               globals.ring_stream = NULL;
-       }
-
-       CloseAudioStream(stream->stream);
-       stream->stream = NULL;
-
-       if (stream->write_timer.timer_interface) {
-               switch_core_timer_destroy(&stream->write_timer);
-       }
-
-       switch_safe_free(stream);
-       return SWITCH_STATUS_SUCCESS;
-}
-static switch_status_t destroy_audio_stream(int indev, int outdev)
-{
-       audio_stream_t *stream;
-
-       switch_mutex_lock(globals.streams_lock);
-       stream = find_audio_stream(indev, outdev,1);
-       if (stream == NULL) {
-               switch_mutex_unlock(globals.streams_lock);
-               return SWITCH_STATUS_FALSE;
-       }
-
-       remove_stream(stream, 1);
-       switch_mutex_unlock(globals.streams_lock);
-
-       destroy_actual_stream(stream);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-
-static void destroy_codecs(void)
-{
-
-       if (switch_core_codec_ready(&globals.read_codec)) {
-               switch_core_codec_destroy(&globals.read_codec);
-       }
-
-       if (switch_core_codec_ready(&globals.write_codec)) {
-               switch_core_codec_destroy(&globals.write_codec);
-       }
-
-       if (globals.read_timer.timer_interface) {
-               switch_core_timer_destroy(&globals.read_timer);
-       }
-
-       if (globals.readfile_timer.timer_interface) {
-               switch_core_timer_destroy(&globals.readfile_timer);
-       }
-
-       if (globals.hold_timer.timer_interface) {
-               switch_core_timer_destroy(&globals.hold_timer);
-       }
-
-       globals.codecs_inited = 0;
-}
-
-static void create_hold_event(private_t *tech_pvt, int unhold)
-{
-       switch_event_t *event;
-       char * event_id;
-
-       if (unhold) {
-               event_id = MY_EVENT_CALL_RESUMED;
-       } else {
-               event_id = MY_EVENT_CALL_HELD;
-       }
-
-       if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, event_id) == SWITCH_STATUS_SUCCESS) {
-               switch_channel_event_set_data(switch_core_session_get_channel(tech_pvt->session), event);
-               switch_event_fire(&event);
-       }
-}
-
-static void add_stream(audio_stream_t * stream, int already_locked)
-{
-       audio_stream_t *last;
-
-       if (! already_locked) {
-               switch_mutex_lock(globals.streams_lock);
-       }
-       for (last = globals.stream_list; last && last->next; last = last->next);
-       if (last == NULL) {
-               globals.stream_list = stream;
-       } else {
-               last->next = stream;
-       }
-       if (! already_locked) {
-               switch_mutex_unlock(globals.streams_lock);
-       }
-}
-static void remove_stream(audio_stream_t * stream, int already_locked)
-{
-       audio_stream_t *previous;
-       if (! already_locked) {
-               switch_mutex_lock(globals.streams_lock);
-       }
-       if (globals.stream_list == stream) {
-               globals.stream_list = stream->next;
-       } else {
-               for (previous = globals.stream_list; previous && previous->next && previous->next != stream; previous = previous->next) {
-                       ;
-               }
-               if (previous) {
-                       previous->next = stream->next;
-               }
-       }
-       if (! already_locked) {
-               switch_mutex_unlock(globals.streams_lock);
-       }
-}
-
-static void add_pvt(private_t *tech_pvt, int master)
-{
-       private_t *tp;
-       uint8_t in_list = 0;
-
-       switch_mutex_lock(globals.pvt_lock);
-
-       if (*tech_pvt->call_id == '\0') {
-               switch_mutex_lock(globals.pa_mutex);
-               switch_snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id);
-               switch_channel_set_variable(switch_core_session_get_channel(tech_pvt->session), SWITCH_PA_CALL_ID_VARIABLE, tech_pvt->call_id);
-               switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
-               if (!tech_pvt->audio_endpoint) {
-                       switch_core_session_set_read_codec(tech_pvt->session, &globals.read_codec);
-                       switch_core_session_set_write_codec(tech_pvt->session, &globals.write_codec);
-               }
-               switch_mutex_unlock(globals.pa_mutex);
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Added call %s\n", tech_pvt->call_id);
-       }
-
-       for (tp = globals.call_list; tp; tp = tp->next) {
-               if (tp == tech_pvt) {
-                       in_list = 1;
-               }
-               if (master && switch_test_flag(tp, TFLAG_MASTER) ) {
-                       switch_clear_flag_locked(tp, TFLAG_MASTER);
-                       create_hold_event(tp, 0);
-               }
-       }
-
-
-       if (master) {
-               if (!in_list) {
-                       tech_pvt->next = globals.call_list;
-                       globals.call_list = tech_pvt;
-               }
-               switch_set_flag_locked(tech_pvt, TFLAG_MASTER);
-
-       } else if (!in_list) {
-               for (tp = globals.call_list; tp && tp->next; tp = tp->next);
-               if (tp) {
-                       tp->next = tech_pvt;
-               } else {
-                       globals.call_list = tech_pvt;
-               }
-       }
-
-       switch_mutex_unlock(globals.pvt_lock);
-}
-
-static void remove_pvt(private_t *tech_pvt)
-{
-       private_t *tp, *last = NULL;
-       int was_master = 0;
-
-       switch_mutex_lock(globals.pvt_lock);
-       for (tp = globals.call_list; tp; tp = tp->next) {
-
-               if (tp == tech_pvt) {
-                       if (switch_test_flag(tp, TFLAG_MASTER)) {
-                               switch_clear_flag_locked(tp, TFLAG_MASTER);
-                               was_master = 1;
-                       }
-                       if (last) {
-                               last->next = tp->next;
-                       } else {
-                               globals.call_list = tp->next;
-                       }
-               }
-               last = tp;
-       }
-
-       if (globals.call_list) {
-               if (was_master && ! globals.no_auto_resume_call) {
-                       switch_set_flag_locked(globals.call_list, TFLAG_MASTER);
-                       create_hold_event(globals.call_list, 1);
-               }
-       } else {
-               globals.deactivate_timer = switch_epoch_time_now(NULL) + 2;
-               destroy_audio_streams();
-       }
-
-       switch_mutex_unlock(globals.pvt_lock);
-}
-
-static void tech_close_file(private_t *tech_pvt)
-{
-       if (tech_pvt->hfh) {
-               tech_pvt->hfh = NULL;
-               switch_core_file_close(&tech_pvt->fh);
-       }
-}
-
-static switch_status_t channel_on_destroy(switch_core_session_t *session)
-{
-       //private_t *tech_pvt = switch_core_session_get_private(session);
-       //switch_assert(tech_pvt != NULL);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static int release_stream_channel(shared_audio_stream_t *stream, int index, int input);
-static switch_status_t channel_on_hangup(switch_core_session_t *session)
-{
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
-
-       if (tech_pvt->audio_endpoint) {
-               audio_endpoint_t *endpoint = tech_pvt->audio_endpoint;
-
-               tech_pvt->audio_endpoint = NULL;
-
-               switch_mutex_lock(endpoint->mutex);
-
-               release_stream_channel(endpoint->in_stream, endpoint->inchan, 1);
-               release_stream_channel(endpoint->out_stream, endpoint->outchan, 0);
-               switch_core_timer_destroy(&endpoint->read_timer);
-               switch_core_timer_destroy(&endpoint->write_timer);
-               switch_core_codec_destroy(&endpoint->read_codec);
-               switch_core_codec_destroy(&endpoint->write_codec);
-               endpoint->master = NULL;
-
-               switch_mutex_unlock(endpoint->mutex);
-       }
-
-       switch_mutex_lock(globals.pa_mutex);
-       switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
-       switch_mutex_unlock(globals.pa_mutex);
-
-       switch_clear_flag_locked(tech_pvt, TFLAG_IO);
-       switch_set_flag_locked(tech_pvt, TFLAG_HUP);
-
-       remove_pvt(tech_pvt);
-
-       tech_close_file(tech_pvt);
-
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n",
-                                         switch_channel_get_name(switch_core_session_get_channel(session)));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
-{
-       switch_channel_t *channel = switch_core_session_get_channel(session);
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
-
-       switch (sig) {
-       case SWITCH_SIG_KILL:
-               switch_set_flag_locked(tech_pvt, TFLAG_HUP);
-               switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-               break;
-       default:
-               break;
-       }
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
-{
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
-{
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
-       return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
-{
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
-
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_endpoint_read(audio_endpoint_t *endpoint, switch_frame_t **frame)
-{
-       int samples = 0;
-
-       if (!endpoint->in_stream) {
-               switch_core_timer_next(&endpoint->read_timer);
-               *frame = &globals.cng_frame;
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       endpoint->read_frame.data = endpoint->read_buf;
-       endpoint->read_frame.buflen = sizeof(endpoint->read_buf);
-       endpoint->read_frame.source = __FILE__;
-       samples = ReadAudioStream(endpoint->in_stream->stream,
-                       endpoint->read_frame.data, STREAM_SAMPLES_PER_PACKET(endpoint->in_stream),
-                       endpoint->inchan, &endpoint->read_timer);
-
-       if (!samples) {
-               switch_core_timer_next(&endpoint->read_timer);
-               *frame = &globals.cng_frame;
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       endpoint->read_frame.datalen = (samples * sizeof(int16_t));
-       endpoint->read_frame.samples = samples;
-       endpoint->read_frame.codec = &endpoint->read_codec;
-       *frame = &endpoint->read_frame;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
-{
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       int samples = 0;
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       switch_assert(tech_pvt != NULL);
-
-       if (tech_pvt->audio_endpoint) {
-               return channel_endpoint_read(tech_pvt->audio_endpoint, frame);
-       }
-
-       if (!globals.main_stream) {
-               goto normal_return;
-       }
-
-       if (switch_test_flag(tech_pvt, TFLAG_HUP)) {
-               goto normal_return;
-       }
-
-       if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-               goto cng_wait;
-       }
-
-       if (!is_master(tech_pvt)) {
-               if (tech_pvt->hold_file) {
-                       switch_size_t olen = globals.read_codec.implementation->samples_per_packet;
-
-                       if (!tech_pvt->hfh) {
-                               int sample_rate = globals.sample_rate;
-                               if (switch_core_file_open(&tech_pvt->fh,
-                                                                                 tech_pvt->hold_file,
-                                                                                 globals.read_codec.implementation->number_of_channels,
-                                                                                 globals.read_codec.implementation->actual_samples_per_second,
-                                                                                 SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-                                       tech_pvt->hold_file = NULL;
-                                       goto cng_wait;
-                               }
-
-                               tech_pvt->hfh = &tech_pvt->fh;
-                               tech_pvt->hold_frame.data = tech_pvt->holdbuf;
-                               tech_pvt->hold_frame.buflen = sizeof(tech_pvt->holdbuf);
-                               tech_pvt->hold_frame.rate = sample_rate;
-                               tech_pvt->hold_frame.codec = &globals.write_codec;
-                       }
-
-                       if (switch_core_timer_next(&globals.hold_timer) != SWITCH_STATUS_SUCCESS) {
-                               switch_core_file_close(&tech_pvt->fh);
-                               goto cng_nowait;
-                       }
-                       switch_core_file_read(tech_pvt->hfh, tech_pvt->hold_frame.data, &olen);
-
-                       if (olen == 0) {
-                               unsigned int pos = 0;
-                               switch_core_file_seek(tech_pvt->hfh, &pos, 0, SEEK_SET);
-                               goto cng_nowait;
-                       }
-
-                       tech_pvt->hold_frame.datalen = (uint32_t) (olen * sizeof(int16_t));
-                       tech_pvt->hold_frame.samples = (uint32_t) olen;
-                       *frame = &tech_pvt->hold_frame;
-
-                       status = SWITCH_STATUS_SUCCESS;
-                       goto normal_return;
-               }
-
-               goto cng_wait;
-       }
-
-       if (tech_pvt->hfh) {
-               tech_close_file(tech_pvt);
-       }
-
-       switch_mutex_lock(globals.device_lock);
-       samples = ReadAudioStream(globals.main_stream->stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, 0, &globals.read_timer);
-       switch_mutex_unlock(globals.device_lock);
-
-       if (samples) {
-               globals.read_frame.datalen = samples * 2;
-               globals.read_frame.samples = samples;
-
-               *frame = &globals.read_frame;
-
-               if (!switch_test_flag((&globals), GFLAG_MOUTH)) {
-                       memset(globals.read_frame.data, 255, globals.read_frame.datalen);
-               }
-               status = SWITCH_STATUS_SUCCESS;
-       } else {
-               goto cng_nowait;
-       }
-
-normal_return:
-       return status;
-
-  cng_nowait:
-       *frame = &globals.cng_frame;
-       return SWITCH_STATUS_SUCCESS;
-
-  cng_wait:
-       switch_core_timer_next(&globals.hold_timer);
-       *frame = &globals.cng_frame;
-       return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t channel_endpoint_write(audio_endpoint_t *endpoint, switch_frame_t *frame)
-{
-       if (!endpoint->out_stream) {
-               switch_core_timer_next(&endpoint->write_timer);
-               return SWITCH_STATUS_SUCCESS;
-       }
-       if (!endpoint->master) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-       if (switch_test_flag(endpoint->master, TFLAG_HUP)) {
-               return SWITCH_STATUS_FALSE;
-       }
-       if (!switch_test_flag(endpoint->master, TFLAG_IO)) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-       WriteAudioStream(endpoint->out_stream->stream, (short *)frame->data,
-                       (int)(frame->datalen / sizeof(SAMPLE)),
-                       endpoint->outchan, &(endpoint->write_timer));
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
-{
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
-
-       if (tech_pvt->audio_endpoint) {
-               return channel_endpoint_write(tech_pvt->audio_endpoint, frame);
-       }
-
-       if (!globals.main_stream) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (switch_test_flag(tech_pvt, TFLAG_HUP)) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (!is_master(tech_pvt) || !switch_test_flag(tech_pvt, TFLAG_IO)) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (globals.main_stream) {
-               if (switch_test_flag((&globals), GFLAG_EAR)) {
-                       WriteAudioStream(globals.main_stream->stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), 0, &(globals.main_stream->write_timer));
-               }
-               status = SWITCH_STATUS_SUCCESS;
-       }
-
-       return status;
-}
-
-static switch_status_t channel_answer_channel(switch_core_session_t *session)
-{
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
-{
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
-
-       switch (msg->message_id) {
-       case SWITCH_MESSAGE_INDICATE_ANSWER:
-               channel_answer_channel(session);
-               break;
-       case SWITCH_MESSAGE_INDICATE_PROGRESS:
-               {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Engage Early Media\n");
-                       switch_set_flag_locked(tech_pvt, TFLAG_IO);
-               }
-       default:
-               break;
-       }
-       return SWITCH_STATUS_SUCCESS;
-}
-
-switch_state_handler_table_t portaudio_event_handlers = {
-       /*.on_init */ channel_on_init,
-       /*.on_routing */ channel_on_routing,
-       /*.on_execute */ channel_on_execute,
-       /*.on_hangup */ channel_on_hangup,
-       /*.on_exchange_media */ channel_on_exchange_media,
-       /*.on_soft_execute */ channel_on_soft_execute,
-       /*.on_consume_media */ NULL,
-       /*.on_hibernate */ NULL,
-       /*.on_reset */ NULL,
-       /*.on_park */ NULL,
-       /*.on_reporting */ NULL,
-       /*.on_destroy */ channel_on_destroy
-};
-
-switch_io_routines_t portaudio_io_routines = {
-       /*.outgoing_channel */ channel_outgoing_channel,
-       /*.read_frame */ channel_read_frame,
-       /*.write_frame */ channel_write_frame,
-       /*.kill_channel */ channel_kill_channel,
-       /*.send_dtmf */ channel_send_dtmf,
-       /*.receive_message */ channel_receive_message
-};
-
-static int create_shared_audio_stream(shared_audio_stream_t *stream);
-static int destroy_shared_audio_stream(shared_audio_stream_t *stream);
-static int take_stream_channel(shared_audio_stream_t *stream, int index, int input)
-{
-       int rc = 0;
-       if (!stream) {
-               return rc;
-       }
-
-       switch_mutex_lock(stream->mutex);
-
-       if (!stream->stream && create_shared_audio_stream(stream)) {
-               rc = -1;
-               goto done;
-       }
-
-       if (input) {
-               if (stream->inchan_used[index]) {
-                       rc = -1;
-                       goto done;
-               }
-               stream->inchan_used[index] = 1;
-       } else {
-               if (!input && stream->outchan_used[index]) {
-                       rc = -1;
-                       goto done;
-               }
-               stream->outchan_used[index] = 1;
-       }
-
-done:
-       switch_mutex_unlock(stream->mutex);
-       return rc;
-}
-
-static int release_stream_channel(shared_audio_stream_t *stream, int index, int input)
-{
-       int i = 0;
-       int destroy_stream = 1;
-       int rc = 0;
-
-       if (!stream) {
-               return rc;
-       }
-
-       switch_mutex_lock(stream->mutex);
-
-       if (input) {
-               stream->inchan_used[index] = 0;
-       } else {
-               stream->outchan_used[index] = 0;
-       }
-
-       for (i = 0; i < stream->channels; i++) {
-               if (stream->inchan_used[i] || stream->outchan_used[i]) {
-                       destroy_stream = 0;
-               }
-       }
-       if (destroy_stream) {
-               destroy_shared_audio_stream(stream);
-       }
-
-       switch_mutex_unlock(stream->mutex);
-       return rc;
-}
-
-/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
-   that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
-*/
-static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-                                                                                                       switch_caller_profile_t *outbound_profile,
-                                                                                                       switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags,
-                                                                                                       switch_call_cause_t *cancel_cause)
-{
-       char name[128];
-       const char *id = NULL;
-       private_t *tech_pvt = NULL;
-       switch_channel_t *channel = NULL;
-       switch_caller_profile_t *caller_profile = NULL;
-       switch_call_cause_t retcause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
-       int codec_ms = -1;
-       int samples_per_packet = -1;
-       int sample_rate = 0;
-       audio_endpoint_t *endpoint = NULL;
-       char *endpoint_name = NULL;
-       const char *endpoint_answer = NULL;
-
-       if (!outbound_profile) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
-               return retcause;
-       }
-
-       if (!(*new_session = switch_core_session_request_uuid(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid")))) {
-               return retcause;
-       }
-
-       switch_core_session_add_stream(*new_session, NULL);
-       if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) {
-               memset(tech_pvt, 0, sizeof(*tech_pvt));
-               switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session));
-               channel = switch_core_session_get_channel(*new_session);
-               switch_core_session_set_private(*new_session, tech_pvt);
-               tech_pvt->session = *new_session;
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
-               switch_core_session_destroy(new_session);
-               return retcause;
-       }
-
-       if (outbound_profile->destination_number && !strncasecmp(outbound_profile->destination_number, "endpoint", sizeof("endpoint")-1)) {
-               endpoint = NULL;
-               endpoint_name = switch_core_strdup(outbound_profile->pool, outbound_profile->destination_number);
-               endpoint_name = strchr(endpoint_name, '/');
-               if (!endpoint_name) {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "No portaudio endpoint specified\n");
-                       goto error;
-               }
-               endpoint_name++;
-               endpoint = switch_core_hash_find(globals.endpoints, endpoint_name);
-               if (!endpoint) {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "Invalid portaudio endpoint %s\n", endpoint_name);
-                       goto error;
-               }
-
-               switch_mutex_lock(endpoint->mutex);
-
-               if (endpoint->master) {
-                       /* someone already has this endpoint */
-                       retcause = SWITCH_CAUSE_USER_BUSY;
-                       goto error;
-               }
-
-               codec_ms = endpoint->in_stream ? endpoint->in_stream->codec_ms : endpoint->out_stream->codec_ms;
-               samples_per_packet = endpoint->in_stream ?
-                       STREAM_SAMPLES_PER_PACKET(endpoint->in_stream) : STREAM_SAMPLES_PER_PACKET(endpoint->out_stream);
-               sample_rate = endpoint->in_stream ? endpoint->in_stream->sample_rate : endpoint->out_stream->sample_rate;
-
-               if (switch_core_timer_init(&endpoint->read_timer,
-                                  globals.timer_name, codec_ms,
-                                  samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to setup read timer for endpoint '%s'!\n", endpoint->name);
-                       goto error;
-               }
-
-               /* The write timer must be setup regardless */
-               if (switch_core_timer_init(&endpoint->write_timer,
-                                  globals.timer_name, codec_ms,
-                                  samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to setup read timer for endpoint '%s'!\n", endpoint->name);
-                       goto error;
-               }
-
-               if (switch_core_codec_init(&endpoint->read_codec,
-                                                                  "L16", NULL, NULL, sample_rate, codec_ms, 1,
-                                                                  SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       goto error;
-               }
-
-               if (switch_core_codec_init(&endpoint->write_codec,
-                                                                  "L16", NULL, NULL, sample_rate, codec_ms, 1,
-                                                                  SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       goto error;
-               }
-               switch_core_session_set_read_codec(tech_pvt->session, &endpoint->read_codec);
-               switch_core_session_set_write_codec(tech_pvt->session, &endpoint->write_codec);
-
-               /* try to acquire the stream */
-               if (take_stream_channel(endpoint->in_stream, endpoint->inchan, 1)) {
-                       retcause = SWITCH_CAUSE_USER_BUSY;
-                       goto error;
-               }
-               if (take_stream_channel(endpoint->out_stream, endpoint->outchan, 0)) {
-                       release_stream_channel(endpoint->in_stream, endpoint->inchan, 1);
-                       retcause = SWITCH_CAUSE_USER_BUSY;
-                       goto error;
-               }
-               switch_snprintf(name, sizeof(name), "portaudio/endpoint-%s", endpoint_name);
-               if (var_event && (endpoint_answer = (switch_event_get_header(var_event, "endpoint_answer")))) {
-                       if (switch_true(endpoint_answer)) {
-                               switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-                       }
-               } else {
-                       switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-               }
-               endpoint->master = tech_pvt;
-               tech_pvt->audio_endpoint = endpoint;
-               switch_mutex_unlock(endpoint->mutex);
-       } else {
-               id = !zstr(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na";
-               switch_snprintf(name, sizeof(name), "portaudio/%s", id);
-               if (outbound_profile->destination_number && !strcasecmp(outbound_profile->destination_number, "auto_answer")) {
-                       switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
-               }
-       }
-       switch_channel_set_name(channel, name);
-       caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
-       switch_channel_set_caller_profile(channel, caller_profile);
-       tech_pvt->caller_profile = caller_profile;
-
-       switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
-       switch_channel_set_state(channel, CS_INIT);
-       switch_channel_set_flag(channel, CF_AUDIO);
-       return SWITCH_CAUSE_SUCCESS;
-
-error:
-       if (endpoint) {
-               if (!endpoint->master) {
-                       if (endpoint->read_timer.interval) {
-                               switch_core_timer_destroy(&endpoint->read_timer);
-                       }
-                       if (endpoint->write_timer.interval) {
-                               switch_core_timer_destroy(&endpoint->write_timer);
-                       }
-                       if (endpoint->read_codec.codec_interface) {
-                               switch_core_codec_destroy(&endpoint->read_codec);
-                       }
-                       if (endpoint->write_codec.codec_interface) {
-                               switch_core_codec_destroy(&endpoint->write_codec);
-                       }
-               }
-               switch_mutex_unlock(endpoint->mutex);
-       }
-
-       switch_core_session_destroy(new_session);
-
-       return retcause;
-}
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load)
-{
-       switch_status_t status;
-       switch_api_interface_t *api_interface;
-
-       module_pool = pool;
-
-       if (paNoError != Pa_Initialize()) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot initialize port audio!\n");
-               return SWITCH_STATUS_TERM;
-       }
-
-       memset(&globals, 0, sizeof(globals));
-
-       switch_core_hash_init(&globals.call_hash);
-       switch_core_hash_init(&globals.sh_streams);
-       switch_core_hash_init(&globals.endpoints);
-       switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool);
-       switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool);
-       switch_mutex_init(&globals.streams_lock, SWITCH_MUTEX_NESTED, module_pool);
-       switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool);
-       switch_mutex_init(&globals.pa_mutex, SWITCH_MUTEX_NESTED, module_pool);
-       globals.codecs_inited = 0;
-       globals.read_frame.data = globals.databuf;
-       globals.read_frame.buflen = sizeof(globals.databuf);
-       globals.cng_frame.data = globals.cngbuf;
-       globals.cng_frame.buflen = sizeof(globals.cngbuf);
-       switch_set_flag((&globals.cng_frame), SFF_CNG);
-       globals.flags = GFLAG_EAR | GFLAG_MOUTH;
-       /* dual streams makes portaudio on solaris choke */
-#if defined(sun) || defined(__sun)
-       globals.dual_streams = 0;
-#endif
-
-       if ((status = load_config()) != SWITCH_STATUS_SUCCESS) {
-               return status;
-       }
-
-       if (dump_info(0)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't find any audio devices!\n");
-               return SWITCH_STATUS_TERM;
-       }
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
-                                         "Input Device: %d, Output Device: %d, Ring Device: %d Sample Rate: %d MS: %d\n", globals.indev,
-                                         globals.outdev, globals.ringdev, globals.sample_rate, globals.codec_ms);
-
-
-       if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       if (switch_event_reserve_subclass(MY_EVENT_MAKE_CALL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-       if (switch_event_reserve_subclass(MY_EVENT_CALL_HELD) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-       if (switch_event_reserve_subclass(MY_EVENT_CALL_RESUMED) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-       if (switch_event_reserve_subclass(MY_EVENT_ERROR_AUDIO_DEV) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-               return SWITCH_STATUS_GENERR;
-       }
-
-
-       /* connect my internal structure to the blank pointer passed to me */
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-       portaudio_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
-       portaudio_endpoint_interface->interface_name = "portaudio";
-       portaudio_endpoint_interface->io_routines = &portaudio_io_routines;
-       portaudio_endpoint_interface->state_handler = &portaudio_event_handlers;
-
-       SWITCH_ADD_API(api_interface, "pa", "PortAudio", pa_cmd, "<command> [<args>]");
-       switch_console_set_complete("add pa help");
-       switch_console_set_complete("add pa dump");
-       switch_console_set_complete("add pa call");
-       switch_console_set_complete("add pa answer");
-       switch_console_set_complete("add pa hangup");
-       switch_console_set_complete("add pa list");
-       switch_console_set_complete("add pa switch");
-       switch_console_set_complete("add pa dtmf");
-       switch_console_set_complete("add pa flags");
-       switch_console_set_complete("add pa devlist");
-       switch_console_set_complete("add pa indev");
-       switch_console_set_complete("add pa outdev");
-       switch_console_set_complete("add pa preparestream");
-       switch_console_set_complete("add pa switchstream");
-       switch_console_set_complete("add pa closestreams");
-       switch_console_set_complete("add pa ringdev");
-       switch_console_set_complete("add pa ringfile");
-       switch_console_set_complete("add pa play");
-       switch_console_set_complete("add pa playdev");
-       switch_console_set_complete("add pa looptest");
-       switch_console_set_complete("add pa shstreams");
-       switch_console_set_complete("add pa endpoints");
-
-       /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static int check_device(char *devstr, int check_input)
-{
-       int devval;
-       if (devstr[0] == '#') {
-               devval = get_dev_by_number(devstr + 1, check_input);
-       } else {
-               devval = get_dev_by_name(devstr, check_input);
-       }
-       return devval;
-}
-
-static switch_status_t load_streams(switch_xml_t streams)
-{
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       switch_xml_t param, mystream;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading streams ...\n");
-       for (mystream = switch_xml_child(streams, "stream"); mystream; mystream = mystream->next) {
-               shared_audio_stream_t *stream = NULL;
-               int devval = -1;
-               char *stream_name = (char *) switch_xml_attr_soft(mystream, "name");
-
-               if (!stream_name) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing stream name attribute, skipping ...\n");
-                       continue;
-               }
-
-               /* check if that stream name is not already used */
-               stream = switch_core_hash_find(globals.sh_streams, stream_name);
-               if (stream) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "A stream with name '%s' already exists\n", stream_name);
-                       continue;
-               }
-
-               stream = switch_core_alloc(module_pool, sizeof(*stream));
-               if (!stream) {
-                       continue;
-               }
-               switch_mutex_init(&stream->mutex, SWITCH_MUTEX_NESTED, module_pool);
-               stream->indev = -1;
-               stream->outdev = -1;
-               stream->sample_rate = globals.sample_rate;
-               stream->codec_ms = globals.codec_ms;
-               stream->channels = 1;
-               switch_snprintf(stream->name, sizeof(stream->name), "%s", stream_name);
-               for (param = switch_xml_child(mystream, "param"); param; param = param->next) {
-                       char *var = (char *) switch_xml_attr_soft(param, "name");
-                       char *val = (char *) switch_xml_attr_soft(param, "value");
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parsing stream '%s' parameter %s = %s\n", stream_name, var, val);
-                       if (!strcmp(var, "indev")) {
-                               devval = check_device(val, 1);
-                               if (devval < 0) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid indev specified for stream '%s'\n", stream_name);
-                                       stream->indev = -1;
-                                       continue;
-                               }
-                               stream->indev = devval;
-                       } else if (!strcmp(var, "outdev")) {
-                               devval = check_device(val, 0);
-                               if (devval < 0) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid outdev specified for stream '%s'\n", stream_name);
-                                       stream->outdev = -1;
-                                       continue;
-                               }
-                               stream->outdev = devval;
-                       } else if (!strcmp(var, "sample-rate")) {
-                               stream->sample_rate = atoi(val);
-                               if (stream->sample_rate < MIN_STREAM_SAMPLE_RATE) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid sample rate specified for stream '%s', forcing to 8000\n", stream_name);
-                                       stream->sample_rate = MIN_STREAM_SAMPLE_RATE;
-                               }
-                       } else if (!strcmp(var, "codec-ms")) {
-                               int tmp = atoi(val);
-                               if (switch_check_interval(stream->sample_rate, tmp)) {
-                                       stream->codec_ms = tmp;
-                               } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-                                                                         "codec-ms must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
-                               }
-                       } else if (!strcmp(var, "channels")) {
-                               stream->channels = atoi(val);
-                               if (stream->channels < 1 || stream->channels > MAX_IO_CHANNELS) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid number of channels specified for stream '%s', forcing to 1\n", stream_name);
-                                       stream->channels = 1;
-                               }
-                       }
-               }
-               if (stream->indev < 0 && stream->outdev < 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                       "You need at least one device for stream '%s'\n", stream_name);
-                       continue;
-               }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
-                               "Created stream '%s', sample-rate = %d, codec-ms = %d\n", stream->name, stream->sample_rate, stream->codec_ms);
-               switch_core_hash_insert(globals.sh_streams, stream->name, stream);
-       }
-       return status;
-}
-
-static int check_stream_compat(shared_audio_stream_t *in_stream, shared_audio_stream_t *out_stream)
-{
-       if (!in_stream || !out_stream) {
-               /* nothing to be compatible with */
-               return 0;
-       }
-       if (in_stream->sample_rate != out_stream->sample_rate) {
-               return -1;
-       }
-       if (in_stream->codec_ms != out_stream->codec_ms) {
-               return -1;
-       }
-       return 0;
-}
-
-static shared_audio_stream_t *check_stream(char *streamstr, int check_input, int *chanindex)
-{
-       shared_audio_stream_t *stream = NULL;
-       int cnum = 0;
-       char stream_name[255];
-       char *chan = NULL;
-
-       *chanindex = -1;
-
-       switch_snprintf(stream_name, sizeof(stream_name), "%s", streamstr);
-
-       chan = strchr(stream_name, ':');
-       if (!chan) {
-               return NULL;
-       }
-       *chan = 0;
-       chan++;
-       cnum = atoi(chan);
-
-       stream = switch_core_hash_find(globals.sh_streams, stream_name);
-       if (!stream) {
-               return NULL;
-       }
-
-       if (cnum < 0 || cnum > stream->channels) {
-               return NULL;
-       }
-
-       if (check_input && stream->indev < 0) {
-               return NULL;
-       }
-
-       if (!check_input && stream->outdev < 0) {
-               return NULL;
-       }
-
-       *chanindex = cnum;
-
-       return stream;
-}
-
-static switch_status_t load_endpoints(switch_xml_t endpoints)
-{
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       switch_xml_t param, myendpoint;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading endpoints ...\n");
-       for (myendpoint = switch_xml_child(endpoints, "endpoint"); myendpoint; myendpoint = myendpoint->next) {
-               audio_endpoint_t *endpoint = NULL;
-               shared_audio_stream_t *stream = NULL;
-               char *endpoint_name = (char *) switch_xml_attr_soft(myendpoint, "name");
-
-               if (!endpoint_name) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing endpoint name attribute, skipping ...\n");
-                       continue;
-               }
-
-               /* check if that endpoint name is not already used */
-               endpoint = switch_core_hash_find(globals.endpoints, endpoint_name);
-               if (endpoint) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "An endpoint with name '%s' already exists\n", endpoint_name);
-                       continue;
-               }
-
-               endpoint = switch_core_alloc(module_pool, sizeof(*endpoint));
-               if (!endpoint) {
-                       continue;
-               }
-               switch_mutex_init(&endpoint->mutex, SWITCH_MUTEX_NESTED, module_pool);
-               endpoint->inchan = -1;
-               endpoint->outchan = -1;
-               switch_snprintf(endpoint->name, sizeof(endpoint->name), "%s", endpoint_name);
-               for (param = switch_xml_child(myendpoint, "param"); param; param = param->next) {
-                       char *var = (char *) switch_xml_attr_soft(param, "name");
-                       char *val = (char *) switch_xml_attr_soft(param, "value");
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parsing endpoint '%s' parameter %s = %s\n", endpoint_name, var, val);
-                       if (!strcmp(var, "instream")) {
-                               stream = check_stream(val, 1, &endpoint->inchan) ;
-                               if (!stream) {
-                                       endpoint->in_stream = NULL;
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid instream specified for endpoint '%s'\n", endpoint_name);
-                                       continue;
-                               }
-                               endpoint->in_stream = stream;
-                       } else if (!strcmp(var, "outstream")) {
-                               stream = check_stream(val, 0, &endpoint->outchan);
-                               if (!stream) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                                       "Invalid outstream specified for endpoint '%s'\n", endpoint_name);
-                                       endpoint->out_stream = NULL;
-                                       continue;
-                               }
-                               endpoint->out_stream = stream;
-                       }
-               }
-               if (!endpoint->in_stream && !endpoint->out_stream) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                       "You need at least one stream for endpoint '%s'\n", endpoint_name);
-                       continue;
-               }
-               if (check_stream_compat(endpoint->in_stream, endpoint->out_stream)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                       "Incompatible input and output streams for endpoint '%s'\n", endpoint_name);
-                       continue;
-               }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
-                               "Created endpoint '%s', instream = %s, outstream = %s\n", endpoint->name,
-                               endpoint->in_stream ? endpoint->in_stream->name : "(none)",
-                               endpoint->out_stream ? endpoint->out_stream->name : "(none)");
-               switch_core_hash_insert(globals.endpoints, endpoint->name, endpoint);
-       }
-       return status;
-}
-
-static switch_status_t load_config(void)
-{
-       char *cf = "portaudio.conf";
-       switch_xml_t cfg, xml, settings, streams, endpoints, param;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-
-       if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
-               return SWITCH_STATUS_TERM;
-       }
-       destroy_audio_streams();
-       destroy_codecs();
-       globals.dual_streams = 0;
-       globals.live_stream_switch = 0;
-       globals.no_auto_resume_call = 0;
-       globals.no_ring_during_call = 0;
-       globals.indev = globals.outdev = globals.ringdev = -1;
-       globals.sample_rate = 8000;
-       globals.unload_device_fail = 0;
-
-       if ((settings = switch_xml_child(cfg, "settings"))) {
-               for (param = switch_xml_child(settings, "param"); param; param = param->next) {
-                       char *var = (char *) switch_xml_attr_soft(param, "name");
-                       char *val = (char *) switch_xml_attr_soft(param, "value");
-
-                       if (!strcmp(var, "debug")) {
-                               globals.debug = atoi(val);
-                       } else if (!strcmp(var, "ring-interval")) {
-                               globals.ring_interval = atoi(val);
-                       } else if (!strcmp(var, "no-auto-resume-call")) {
-                               if (switch_true(val)) {
-                                       globals.no_auto_resume_call = 1;
-                               } else {
-                                       globals.no_auto_resume_call = 0;
-                               }
-                       } else if (!strcmp(var, "no-ring-during-call")) {
-                               if (switch_true(val)) {
-                                       globals.no_ring_during_call = 1;
-                               } else {
-                                       globals.no_ring_during_call = 0;
-                               }
-                       } else if (!strcmp(var, "live-stream-switch")) {
-                               if (switch_true(val)) {
-                                       globals.live_stream_switch = 1;
-                               } else {
-                                       globals.live_stream_switch = 0;
-                               }
-                       } else if (!strcmp(var, "ring-file")) {
-                               set_global_ring_file(val);
-                       } else if (!strcmp(var, "hold-file")) {
-                               set_global_hold_file(val);
-                       } else if (!strcmp(var, "dual-streams")) {
-                               if (switch_true(val)) {
-                                       globals.dual_streams = 1;
-                               } else {
-                                       globals.dual_streams = 0;
-                               }
-                       } else if (!strcmp(var, "timer-name")) {
-                               set_global_timer_name(val);
-                       } else if (!strcmp(var, "sample-rate")) {
-                               globals.sample_rate = atoi(val);
-                       } else if (!strcmp(var, "codec-ms")) {
-                               int tmp = atoi(val);
-                               if (switch_check_interval(globals.sample_rate, tmp)) {
-                                       globals.codec_ms = tmp;
-                               } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-                                                                         "codec-ms must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
-                               }
-                       } else if (!strcmp(var, "dialplan")) {
-                               set_global_dialplan(val);
-                       } else if (!strcmp(var, "context")) {
-                               set_global_context(val);
-                       } else if (!strcmp(var, "cid-name")) {
-                               set_global_cid_name(val);
-                       } else if (!strcmp(var, "cid-num")) {
-                               set_global_cid_num(val);
-                       } else if (!strcmp(var, "indev")) {
-                               if (*val == '#') {
-                                       globals.indev = get_dev_by_number(val + 1, 1);
-                               } else {
-                                       globals.indev = get_dev_by_name(val, 1);
-                               }
-                       } else if (!strcmp(var, "outdev")) {
-                               if (*val == '#') {
-                                       globals.outdev = get_dev_by_number(val + 1, 0);
-                               } else {
-                                       globals.outdev = get_dev_by_name(val, 0);
-                               }
-                       } else if (!strcmp(var, "ringdev")) {
-                               if (*val == '#') {
-                                       globals.ringdev = get_dev_by_number(val + 1, 0);
-                               } else {
-                                       globals.ringdev = get_dev_by_name(val, 0);
-                               }
-                       } else if (!strcasecmp(var, "unload-on-device-fail")) {
-                               globals.unload_device_fail = switch_true(val);
-                       }
-               }
-       }
-
-       if (!globals.dialplan) {
-               set_global_dialplan("XML");
-       }
-
-       if (!globals.context) {
-               set_global_context("default");
-       }
-
-       if (!globals.sample_rate) {
-               globals.sample_rate = 8000;
-       }
-
-       if (!globals.codec_ms) {
-               globals.codec_ms = 20;
-       }
-
-       globals.cng_frame.datalen = switch_samples_per_packet(globals.sample_rate, globals.codec_ms) * 2;
-
-       if (!globals.ring_interval) {
-               globals.ring_interval = 5;
-       }
-
-       if (!globals.timer_name) {
-               set_global_timer_name("soft");
-       }
-
-       if (globals.indev < 0) {
-               globals.indev = get_dev_by_name(NULL, 1);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "global indev [%d]\n", globals.indev);
-               if (globals.indev > -1) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default input device\n");
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an input device\n");
-                       if (globals.unload_device_fail) {
-                               status = SWITCH_STATUS_GENERR;
-                       }
-               }
-       }
-
-       if (globals.outdev < 0) {
-               globals.outdev = get_dev_by_name(NULL, 0);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "global outdev [%d]\n", globals.outdev);
-               if (globals.outdev > -1) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Switching to default output device\n");
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find an output device\n");
-                       if (globals.unload_device_fail) {
-                               status = SWITCH_STATUS_GENERR;
-                       }
-               }
-       }
-
-       if (globals.ringdev < 0) {
-               if (globals.outdev > -1) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid or no ring device configured, using output device as ring device\n");
-                       globals.ringdev = globals.outdev;
-               }
-       }
-
-       /* streams and endpoints must be last, some initialization depend on globals defaults */
-       if ((streams = switch_xml_child(cfg, "streams"))) {
-               load_streams(streams);
-       }
-
-       if ((endpoints = switch_xml_child(cfg, "endpoints"))) {
-               load_endpoints(endpoints);
-       }
-
-
-       switch_xml_free(xml);
-
-       return status;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_shutdown)
-{
-
-       destroy_audio_streams();
-       destroy_codecs();
-
-       Pa_Terminate();
-       switch_core_hash_destroy(&globals.call_hash);
-       switch_core_hash_destroy(&globals.sh_streams);
-       switch_core_hash_destroy(&globals.endpoints);
-
-       switch_event_free_subclass(MY_EVENT_RINGING);
-       switch_event_free_subclass(MY_EVENT_MAKE_CALL);
-       switch_event_free_subclass(MY_EVENT_ERROR_AUDIO_DEV);
-       switch_event_free_subclass(MY_EVENT_CALL_HELD);
-       switch_event_free_subclass(MY_EVENT_CALL_RESUMED);
-
-
-       switch_safe_free(globals.dialplan);
-       switch_safe_free(globals.context);
-       switch_safe_free(globals.cid_name);
-       switch_safe_free(globals.cid_num);
-       switch_safe_free(globals.ring_file);
-       switch_safe_free(globals.hold_file);
-       switch_safe_free(globals.timer_name);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static int get_dev_by_number(char *numstr, int in)
-{
-       int numDevices = Pa_GetDeviceCount();
-       const PaDeviceInfo *pdi;
-       char *end_ptr;
-       int number;
-
-       number = (int) strtol(numstr, &end_ptr, 10);
-
-       if (end_ptr == numstr || number < 0) {
-               return -1;
-       }
-
-       if (number > -1 && number < numDevices && (pdi = Pa_GetDeviceInfo(number))) {
-               if (in && pdi->maxInputChannels) {
-                       return number;
-               } else if (!in && pdi->maxOutputChannels) {
-                       return number;
-               }
-       }
-
-       return -1;
-}
-
-static int get_dev_by_name(char *name, int in)
-{
-       int i;
-       int numDevices;
-       const PaDeviceInfo *pdi;
-       numDevices = Pa_GetDeviceCount();
-
-       if (numDevices < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-               return -2;
-       }
-
-       for (i = 0; i < numDevices; i++) {
-               int match = 0;
-               pdi = Pa_GetDeviceInfo(i);
-
-               if (zstr(name)) {
-                       match = 1;
-               } else if (pdi && pdi->name && strstr(pdi->name, name)) {
-                       match = 1;
-               }
-
-               if (match) {
-                       if (in && pdi->maxInputChannels) {
-                               return i;
-                       } else if (!in && pdi->maxOutputChannels) {
-                               return i;
-                       }
-               }
-       }
-
-       return -1;
-}
-
-
-/*******************************************************************/
-static void PrintSupportedStandardSampleRates(const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-       int i, printCount, cr = 7;
-       PaError err;
-       static double standardSampleRates[] = { 8000.0, 9600.0, 11025.0, 12000.0, 16000.0, 22050.0, 24000.0, 32000.0,
-               44100.0, 48000.0, 88200.0, 96000.0, 192000.0, -1
-       };
-
-       printCount = cr;
-       for (i = 0; standardSampleRates[i] > 0; i++) {
-               err = Pa_IsFormatSupported(inputParameters, outputParameters, standardSampleRates[i]);
-               if (err == paFormatIsSupported) {
-                       if (printCount == cr) {
-                               printCount = 0;
-                               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "\n\t%0.2f", standardSampleRates[i]);
-                       } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, ", %0.2f", standardSampleRates[i]);
-                       }
-                       printCount++;
-               }
-       }
-       if (!printCount) {
-               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, " None\n");
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "\n");
-       }
-}
-
-/*******************************************************************/
-static switch_status_t play_dev(switch_stream_handle_t *stream, int outdev, char * file, const char * max_seconds, const char * no_close)
-{
-       switch_file_handle_t fh = { 0 };
-       int samples = 0;
-       int seconds = 5;
-       audio_stream_t * audio_stream;
-       int created_stream = 0;
-       int wrote = 0;
-       switch_size_t olen;
-       int16_t abuf[2048];
-
-
-       if (!strcasecmp(file, "ringtest")) {
-               file = globals.ring_file;
-       }
-       if (outdev == -1) {
-               stream->write_function(stream, "Invalid output audio device\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       audio_stream = get_audio_stream(-1, outdev);
-
-       fh.pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN;
-
-       if (switch_core_file_open(&fh,  file,
-               globals.read_codec.implementation->number_of_channels,
-               globals.read_codec.implementation->actual_samples_per_second,
-               SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-                       stream->write_function(stream, "Cannot play requested file %s\n", file);
-                       return SWITCH_STATUS_FALSE;
-       }
-
-       olen = globals.read_codec.implementation->samples_per_packet;
-
-       if (max_seconds) {
-               int i = atoi(max_seconds);
-               if (i >= 0) {
-                       seconds = i;
-               }
-       }
-
-       if (globals.call_list) {
-               switch_mutex_lock(globals.pvt_lock);
-               if (!globals.main_stream) {
-                       switch_mutex_unlock(globals.pvt_lock);
-                       return SWITCH_STATUS_FALSE;
-               }
-
-               if ( switch_test_flag(globals.call_list, TFLAG_MASTER) && globals.main_stream->outdev == outdev) { /*so we are the active stream so we need to dupe it basically */
-                       audio_stream = create_audio_stream(-1,outdev);
-                       created_stream=1;
-               }
-               switch_mutex_unlock(globals.pvt_lock);
-       }
-
-       if (! audio_stream) {
-               stream->write_function(stream, "Failed to engage audio device\n");
-               return SWITCH_STATUS_FALSE;
-       }
-
-
-
-       samples = globals.read_codec.implementation->actual_samples_per_second * seconds;
-       globals.stream_in_use=1;
-       while (switch_core_file_read(&fh, abuf, &olen) == SWITCH_STATUS_SUCCESS) {
-               if (globals.destroying_streams ||  ! audio_stream->stream) {
-                       break;
-               }
-
-               WriteAudioStream(audio_stream->stream, abuf, (long) olen, 0, &(audio_stream->write_timer));
-               wrote += (int) olen;
-               if (samples) {
-                       samples -= (int) olen;
-                       if (samples <= 0) {
-                               break;
-                       }
-               }
-               olen = globals.read_codec.implementation->samples_per_packet;
-       }
-       globals.stream_in_use = 0;
-
-       switch_core_file_close(&fh);
-       if (! globals.call_list && ( ! no_close || strcasecmp(no_close,  "no_close"))) {
-               destroy_audio_streams();
-       }
-
-       seconds = wrote / globals.read_codec.implementation->actual_samples_per_second;
-       stream->write_function(stream, "playback test [%s] %d second(s) %d samples @%dkhz",
-               file, seconds, wrote, globals.read_codec.implementation->actual_samples_per_second);
-       if (created_stream) { /*still need this as not added to the global pool */
-               destroy_actual_stream(audio_stream);
-       }
-       return SWITCH_STATUS_SUCCESS;
-}
-static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int i, numDevices, prev;
-       const PaDeviceInfo *deviceInfo;
-       const PaHostApiInfo *hostApiInfo;
-
-       numDevices = Pa_GetDeviceCount();
-
-       if (numDevices < 0) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (argv[0] && !strcasecmp(argv[0], "xml")) {
-               stream->write_function(stream, "<xml>\n\t<devices>\n");
-
-               for (i = 0; i < numDevices; i++) {
-                       deviceInfo = Pa_GetDeviceInfo(i);
-                       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"
-                                                          "\t\t<ring device=\"%d\" />\n"
-                                                          "\t\t<input device=\"%d\" />\n"
-                                                          "\t\t<output device=\"%d\" />\n" "\t</bindings>\n</xml>\n", globals.ringdev, globals.indev, globals.outdev);
-       } else {
-
-               for (i = 0; i < numDevices; i++) {
-                       deviceInfo = Pa_GetDeviceInfo(i);
-                       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");
-                               prev = 1;
-                       }
-
-                       if (globals.indev == i) {
-                               if (prev) {
-                                       stream->write_function(stream, ",");
-                               }
-                               stream->write_function(stream, "i");
-                               prev = 1;
-                       }
-
-                       if (globals.outdev == i) {
-                               if (prev) {
-                                       stream->write_function(stream, ",");
-                               }
-                               stream->write_function(stream, "o");
-                       }
-
-                       stream->write_function(stream, "\n");
-
-               }
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static int dump_info(int verbose)
-{
-       int i, numDevices, defaultDisplayed;
-       const PaDeviceInfo *deviceInfo;
-       PaStreamParameters inputParameters, outputParameters;
-       PaError err;
-       const char *line = "--------------------------------------------------------------------------------\n";
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
-                                         "PortAudio version number = %d\nPortAudio version text = '%s'\n", Pa_GetVersion(), Pa_GetVersionText());
-       if (globals.call_list) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return 0;
-       }
-
-       if (verbose < 0) {
-               destroy_audio_streams();
-               destroy_codecs();
-               Pa_Terminate();
-               Pa_Initialize();
-               load_config();
-               verbose = 0;
-       }
-
-       numDevices = Pa_GetDeviceCount();
-       if (numDevices < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-               err = numDevices;
-               goto error;
-       }
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Number of devices = %d\n", numDevices);
-
-       if (!verbose) {
-               return 0;
-       }
-
-       for (i = 0; i < numDevices; i++) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s", line);
-               deviceInfo = Pa_GetDeviceInfo(i);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Device #%d ", i);
-
-               /* Mark global and API specific default devices */
-               defaultDisplayed = 0;
-               if (i == Pa_GetDefaultInputDevice()) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default Input");
-                       defaultDisplayed = 1;
-
-               } else if (i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice) {
-
-                       const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default %s Input", hostInfo->name);
-                       defaultDisplayed = 1;
-               }
-
-               if (i == Pa_GetDefaultOutputDevice()) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default Output");
-                       defaultDisplayed = 1;
-
-               } else if (i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice) {
-
-                       const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo(deviceInfo->hostApi);
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "**Default %s Output", hostInfo->name);
-                       defaultDisplayed = 1;
-               }
-
-               if (defaultDisplayed) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "** | ");
-               }
-               /* print device info fields */
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Name: %s\n", deviceInfo->name);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Host: %s | ", Pa_GetHostApiInfo(deviceInfo->hostApi)->name);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "inputs: %d | ", deviceInfo->maxInputChannels);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "outputs: %d | ", deviceInfo->maxOutputChannels);
-
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default rate: %8.2f\n", deviceInfo->defaultSampleRate);
-
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default input latency: %.3f | ", deviceInfo->defaultLowInputLatency);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Default output latency: %.3f\n", deviceInfo->defaultLowOutputLatency);
-
-               /* poll for standard sample rates */
-               inputParameters.device = i;
-               inputParameters.channelCount = deviceInfo->maxInputChannels;
-               inputParameters.sampleFormat = paInt16;
-               inputParameters.suggestedLatency = deviceInfo->defaultLowInputLatency;  /* ignored by Pa_IsFormatSupported() */
-               inputParameters.hostApiSpecificStreamInfo = NULL;
-
-               outputParameters.device = i;
-               outputParameters.channelCount = deviceInfo->maxOutputChannels;
-               outputParameters.sampleFormat = paInt16;
-               outputParameters.suggestedLatency = deviceInfo->defaultLowOutputLatency;        /* ignored by Pa_IsFormatSupported() */
-               outputParameters.hostApiSpecificStreamInfo = NULL;
-
-               if (inputParameters.channelCount > 0) {
-
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "half-duplex 16 bit %d channel input rates:", inputParameters.channelCount);
-                       PrintSupportedStandardSampleRates(&inputParameters, NULL);
-               }
-
-               if (outputParameters.channelCount > 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "half-duplex 16 bit %d channel output rates:", outputParameters.channelCount);
-                       PrintSupportedStandardSampleRates(NULL, &outputParameters);
-               }
-
-               if (inputParameters.channelCount > 0 && outputParameters.channelCount > 0) {
-
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
-                                                         "full-duplex 16 bit %d channel input, %d channel output rates:", inputParameters.channelCount,
-                                                         outputParameters.channelCount);
-                       PrintSupportedStandardSampleRates(&inputParameters, &outputParameters);
-               }
-       }
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s", line);
-
-       return 0;
-
-  error:
-       switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occurred while using the portaudio stream\n");
-       switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error number: %d\n", err);
-       switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error message: %s\n", Pa_GetErrorText(err));
-       return err;
-}
-
-static switch_status_t create_codecs(int restart)
-{
-       int sample_rate = globals.sample_rate;
-       int codec_ms = globals.codec_ms;
-
-       if (restart) {
-               destroy_codecs();
-       }
-       if (globals.codecs_inited) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (!switch_core_codec_ready(&globals.read_codec)) {
-               if (switch_core_codec_init(&globals.read_codec,
-                                                                  "L16",
-                                                                  NULL,
-                                                                  NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-                                                                  NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-       switch_assert(globals.read_codec.implementation);
-
-       if (!switch_core_codec_ready(&globals.write_codec)) {
-               if (switch_core_codec_init(&globals.write_codec,
-                                                                  "L16",
-                                                                  NULL,
-                                                                  NULL,
-                                                                  sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       switch_core_codec_destroy(&globals.read_codec);
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-       if (!globals.read_timer.timer_interface) {
-               if (switch_core_timer_init(&globals.read_timer,
-                                                                  globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-                       switch_core_codec_destroy(&globals.read_codec);
-                       switch_core_codec_destroy(&globals.write_codec);
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-       if (!globals.readfile_timer.timer_interface) {
-               if (switch_core_timer_init(&globals.readfile_timer,
-                                                                  globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-                       switch_core_codec_destroy(&globals.read_codec);
-                       switch_core_codec_destroy(&globals.write_codec);
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-
-       if (!globals.hold_timer.timer_interface) {
-               if (switch_core_timer_init(&globals.hold_timer,
-                                                                  globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet,
-                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n");
-                       switch_core_codec_destroy(&globals.read_codec);
-                       switch_core_codec_destroy(&globals.write_codec);
-                       switch_core_timer_destroy(&globals.read_timer);
-                       switch_core_timer_destroy(&globals.readfile_timer);
-
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-       globals.cng_frame.rate = globals.read_frame.rate = sample_rate;
-       globals.cng_frame.codec = globals.read_frame.codec = &globals.read_codec;
-
-       globals.codecs_inited=1;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_audio_stream()
-{
-       audio_stream_t *stream;
-       if (! globals.call_list) { /* If no active calls then it will automatically switch over on next call */
-               return SWITCH_STATUS_SUCCESS;
-       }
-       stream = get_audio_stream(globals.indev, globals.outdev);
-       if (stream == NULL) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       globals.main_stream = stream;//TODO: need locks around here??
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-PaError open_audio_stream(PABLIO_Stream **stream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-       if (inputParameters->device != -1) {
-               return OpenAudioStream(stream, inputParameters, outputParameters, globals.sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet, globals.dual_streams);
-       }
-       return OpenAudioStream(stream, NULL, outputParameters, globals.sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet, 0);
-}
-
-PaError open_shared_audio_stream(shared_audio_stream_t *shstream, const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters)
-{
-       PaError err;
-       if (inputParameters->device != -1) {
-               err = OpenAudioStream(&shstream->stream, inputParameters->device != -1 ? inputParameters : NULL,
-                                                       outputParameters->device != -1 ? outputParameters : NULL, shstream->sample_rate,
-                               paClipOff, STREAM_SAMPLES_PER_PACKET(shstream), globals.dual_streams);
-       } else {
-               err = OpenAudioStream(&shstream->stream, NULL, outputParameters, shstream->sample_rate,
-                               paClipOff, STREAM_SAMPLES_PER_PACKET(shstream), 0);
-       }
-       if (err != paNoError) {
-               shstream->stream = NULL;
-       }
-       return err;
-}
-
-static int create_shared_audio_stream(shared_audio_stream_t *shstream)
-{
-       PaStreamParameters inputParameters, outputParameters;
-       PaError err;
-       switch_event_t *event;
-
-       inputParameters.device = shstream->indev;
-       if (shstream->indev != -1) {
-               inputParameters.channelCount = shstream->channels;
-               inputParameters.sampleFormat = SAMPLE_TYPE;
-               inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-               inputParameters.hostApiSpecificStreamInfo = NULL;
-       }
-       outputParameters.device = shstream->outdev;
-       if (shstream->outdev != -1) {
-               outputParameters.channelCount = shstream->channels;
-               outputParameters.sampleFormat = SAMPLE_TYPE;
-               outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-               outputParameters.hostApiSpecificStreamInfo = NULL;
-       }
-
-       err = open_shared_audio_stream(shstream, &inputParameters, &outputParameters);
-       if (err != paNoError) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
-                                               "Error opening audio device retrying (indev = %d, outdev = %d, error = %s)\n",
-                                               inputParameters.device, outputParameters.device, Pa_GetErrorText(err));
-               switch_yield(1000000);
-               err = open_shared_audio_stream(shstream, &inputParameters, &outputParameters);
-       }
-
-       if (err != paNoError) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device (indev = %d, outdev = %d, error = %s)\n",
-                               inputParameters.device, outputParameters.device, Pa_GetErrorText(err));
-               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ERROR_AUDIO_DEV) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Reason", Pa_GetErrorText(err));
-                       switch_event_fire(&event);
-               }
-               return -1;
-       }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created shared audio stream %s: %d channels %d\n",
-                       shstream->name, shstream->sample_rate, shstream->channels);
-       return 0;
-}
-
-static int destroy_shared_audio_stream(shared_audio_stream_t *shstream)
-{
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying shared audio stream %s\n", shstream->name);
-       CloseAudioStream(shstream->stream);
-       shstream->stream = NULL;
-       return 0;
-}
-
-static audio_stream_t *create_audio_stream(int indev, int outdev)
-{
-       PaStreamParameters inputParameters, outputParameters;
-       PaError err;
-       switch_event_t *event;
-       audio_stream_t *stream;
-
-       stream = malloc(sizeof(*stream));
-       if (stream == NULL) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to alloc memory\n");
-               return NULL;
-       }
-       memset(stream, 0, sizeof(*stream));
-       stream->next = NULL;
-       stream->stream = NULL;
-       stream->indev = indev;
-       stream->outdev = outdev;
-       if (!stream->write_timer.timer_interface) {
-               if (switch_core_timer_init(&(stream->write_timer),
-                                                                  globals.timer_name, globals.codec_ms, globals.read_codec.implementation->samples_per_packet,
-                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-                       switch_safe_free(stream);
-                       return NULL;
-               }
-       }
-
-       inputParameters.device = indev;
-       if (indev != -1) {
-               inputParameters.channelCount = 1;
-               inputParameters.sampleFormat = SAMPLE_TYPE;
-               inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-               inputParameters.hostApiSpecificStreamInfo = NULL;
-       }
-       outputParameters.device = outdev;
-
-       if (outdev != -1) {
-               outputParameters.channelCount = 1;
-               outputParameters.sampleFormat = SAMPLE_TYPE;
-               outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-               outputParameters.hostApiSpecificStreamInfo = NULL;
-       }
-
-       err = open_audio_stream(&(stream->stream), &inputParameters, &outputParameters);
-       if (err != paNoError) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening audio device retrying\n");
-               switch_yield(1000000);
-               err = open_audio_stream(&(stream->stream), &inputParameters, &outputParameters);
-       }
-
-       if (err != paNoError) {
-               switch_safe_free(stream);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n");
-               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ERROR_AUDIO_DEV) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Reason", Pa_GetErrorText(err));
-                       switch_event_fire(&event);
-               }
-               return NULL;
-       }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created audio stream: %d channels %d\n", globals.sample_rate, outputParameters.channelCount);
-       return stream;
-}
-
-audio_stream_t *get_audio_stream(int indev, int outdev)
-{
-       audio_stream_t *stream = NULL;
-       if (outdev == -1) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid output audio device\n");
-               return NULL;
-       }
-       if (create_codecs(0) != SWITCH_STATUS_SUCCESS) {
-               return NULL;
-       }
-
-       stream = find_audio_stream(indev, outdev, 0);
-       if (stream != NULL) {
-               return stream;
-       }
-       stream = create_audio_stream(indev, outdev);
-       if (stream) {
-               add_stream(stream, 0);
-       }
-       return stream;
-}
-
-static switch_status_t dtmf_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       char *dtmf_str = argv[0];
-       switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) };
-
-       if (zstr(dtmf_str)) {
-               stream->write_function(stream, "No DTMF Supplied!\n");
-       } else {
-               switch_mutex_lock(globals.pvt_lock);
-               if (globals.call_list) {
-                       switch_channel_t *channel = switch_core_session_get_channel(globals.call_list->session);
-                       char *p = dtmf_str;
-                       while (p && *p) {
-                               dtmf.digit = *p;
-                               switch_channel_queue_dtmf(channel, &dtmf);
-                               p++;
-                       }
-               }
-               switch_mutex_unlock(globals.pvt_lock);
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_shared_streams(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       switch_hash_index_t *hi;
-       int cnt = 0;
-       for (hi = switch_core_hash_first(globals.sh_streams); hi; hi = switch_core_hash_next(&hi)) {
-               const void *var;
-               void *val;
-               shared_audio_stream_t *s = NULL;
-               switch_core_hash_this(hi, &var, NULL, &val);
-               s = val;
-               stream->write_function(stream, "%s> indev: %d, outdev: %d, sample-rate: %d, codec-ms: %d, channels: %d\n",
-                               s->name, s->indev, s->outdev, s->sample_rate, s->codec_ms, s->channels);
-               cnt++;
-       }
-       stream->write_function(stream, "Total streams: %d\n", cnt);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_endpoints(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       switch_hash_index_t *hi;
-       int cnt = 0;
-       for (hi = switch_core_hash_first(globals.endpoints); hi; hi = switch_core_hash_next(&hi)) {
-               const void *var;
-               void *val;
-               audio_endpoint_t *e = NULL;
-               switch_core_hash_this(hi, &var, NULL, &val);
-               e = val;
-               stream->write_function(stream, "%s> instream: %s, outstream: %s\n",
-                               e->name, e->in_stream ? e->in_stream->name : "(none)",
-                               e->out_stream ? e->out_stream->name : "(none)");
-               cnt++;
-       }
-       stream->write_function(stream, "Total endpoints: %d\n", cnt);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t close_streams(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       if (globals.call_list) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       destroy_audio_streams();
-       stream->write_function(stream, "closestreams all open streams closed\n");
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_indev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int devval;
-
-       if (globals.call_list && ! globals.live_stream_switch) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (*argv[0] == '#') {
-               devval = get_dev_by_number(argv[0] + 1, 1);
-       } else {
-               devval = get_dev_by_name(argv[0], 1);
-       }
-       if (devval < 0) {
-               stream->write_function(stream, "indev not set (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       globals.indev = devval;
-       switch_audio_stream();
-       stream->write_function(stream, "indev set to %d\n", devval);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_outdev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int devval;
-       if (globals.call_list && ! globals.live_stream_switch) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (*argv[0] == '#') {
-               devval = get_dev_by_number(argv[0] + 1, 0);
-       } else {
-               devval = get_dev_by_name(argv[0], 0);
-       }
-       if (devval < 0) {
-               stream->write_function(stream, "outdev not set (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-
-       globals.outdev = devval;
-       switch_audio_stream();
-       stream->write_function(stream, "outdev set to %d\n", devval);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t prepare_stream(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int devval=-2,devval2=-1;
-       if (! strcmp(argv[0], "#-1")) {
-               devval = -1;
-       } else if (*argv[0] == '#') {
-               devval = get_dev_by_number(argv[0]+1, 1);
-       }
-       if (devval == -2) {
-               stream->write_function(stream, "preparestream not prepared as indev has (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (*argv[1] == '#') {
-               devval2 = get_dev_by_number(argv[1]+1, 0);
-       }
-       if (devval2 == -1) {
-               stream->write_function(stream, "preparestream not prepared as outdev has (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (! get_audio_stream(devval,devval2)) {
-               stream->write_function(stream, "preparestream not prepared received an invalid stream back\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       stream->write_function(stream, "preparestream prepared indev: %d outdev: %d\n", devval, devval2);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_stream(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int devval =-1, devval2 = -1;
-       if (globals.call_list && ! globals.live_stream_switch) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (*argv[0] == '#') {
-               devval = get_dev_by_number(argv[0]+1, 1);
-       }
-       if (devval == -1) {
-               stream->write_function(stream, "switchstream not prepared as indev has (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (*argv[1] == '#') {
-               devval2 = get_dev_by_number(argv[1]+1, 0);
-       }
-       if (devval2 == -1) {
-               stream->write_function(stream, "switchstream not prepared as outdev has (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       globals.indev = devval;
-       globals.outdev = devval2;
-       if (switch_audio_stream() != SWITCH_STATUS_SUCCESS) {
-               stream->write_function(stream, "switchstream was unable to switch\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       stream->write_function(stream, "switchstream switched to indev: %d outdev: %d\n", devval, devval2);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_ringdev(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int devval;
-       if (globals.call_list && ! globals.live_stream_switch) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (! strcmp(argv[0], "#-1")) {
-               globals.ring_stream = NULL;
-               globals.ringdev = -1;
-               stream->write_function(stream, "ringdev set to %d\n", globals.ringdev);
-               return SWITCH_STATUS_SUCCESS;
-       } else if (*argv[0] == '#') {
-               devval = get_dev_by_number(argv[0] + 1, 0);
-       } else {
-               devval = get_dev_by_name(argv[0], 0);
-       }
-       if (devval == -1) {
-               stream->write_function(stream, "ringdev not set as dev has (invalid value)\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       globals.ringdev = devval;
-       stream->write_function(stream, "ringdev set to %d\n", globals.ringdev);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t looptest(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       int samples = 0;
-       int success = 0;
-       int i;
-
-       if (globals.call_list) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       if (validate_main_audio_stream() != SWITCH_STATUS_SUCCESS) {
-               stream->write_function(stream, "looptest Failed to engage audio device\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       globals.stream_in_use = 1;
-       for (i = 0; i < 400; i++) {
-               if (globals.destroying_streams ||  ! globals.main_stream->stream) {
-                       break;
-               }
-               if ((samples = ReadAudioStream(globals.main_stream->stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, 0, &globals.read_timer))) {
-                       WriteAudioStream(globals.main_stream->stream, globals.read_frame.data, (long) samples, 0, &(globals.main_stream->write_timer));
-                       success = 1;
-               }
-               switch_yield(10000);
-       }
-       globals.stream_in_use = 0;
-
-       if (!success) {
-               stream->write_function(stream, "Failed to read any bytes from indev\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       destroy_audio_streams();
-       stream->write_function(stream, "looptest complete\n");
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t set_ringfile(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       if (! argv[0]) {
-               stream->write_function(stream, "%s", globals.ring_file);
-               return SWITCH_STATUS_SUCCESS;
-       }
-       if (create_codecs(0) == SWITCH_STATUS_SUCCESS) {
-               switch_file_handle_t fh = { 0 };
-               if (switch_core_file_open(&fh,
-                                                                 argv[0],
-                                                                 globals.read_codec.implementation->number_of_channels,
-                                                                 globals.read_codec.implementation->actual_samples_per_second,
-                                                                 SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) {
-                       switch_core_file_close(&fh);
-                       set_global_ring_file(argv[0]);
-               } else {
-                       stream->write_function(stream, "ringfile Unable to open ring file %s\n", argv[0]);
-                       return SWITCH_STATUS_FALSE;
-               }
-       } else {
-               stream->write_function(stream, "ringfile Failed to init codecs device\n");
-               return SWITCH_STATUS_FALSE;
-       }
-       stream->write_function(stream, "ringfile set to %s", globals.ring_file);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       private_t *tp, *tech_pvt = NULL;
-       char *callid = argv[0];
-       uint8_t one_call = 0;
-
-
-       switch_mutex_lock(globals.pvt_lock);
-       if (zstr(callid)) {
-               if (globals.call_list) {
-                       if (globals.call_list->next) {
-                               tech_pvt = globals.call_list->next;
-                       } else {
-                               tech_pvt = globals.call_list;
-                               one_call = 1;
-                       }
-               }
-       } else if (!strcasecmp(callid, "none")) {
-               for (tp = globals.call_list; tp; tp = tp->next) {
-                       if (switch_test_flag(tp, TFLAG_MASTER)) {
-                       switch_clear_flag_locked(tp, TFLAG_MASTER);
-                               create_hold_event(tp,0);
-                       }
-               }
-               stream->write_function(stream, "OK\n");
-               goto done;
-       } else {
-               tech_pvt = switch_core_hash_find(globals.call_hash, callid);
-       }
-
-       if (tech_pvt) {
-               if (tech_pvt == globals.call_list && !tech_pvt->next) {
-                       one_call = 1;
-               }
-
-               if (!one_call) {
-                       remove_pvt(tech_pvt);
-               }
-               add_pvt(tech_pvt, PA_MASTER);
-               create_hold_event(tech_pvt, 1);
-               stream->write_function(stream, "OK\n");
-       } else {
-               stream->write_function(stream, "NO SUCH CALL\n");
-       }
-
-  done:
-       switch_mutex_unlock(globals.pvt_lock);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t hangup_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       private_t *tech_pvt;
-       char *callid = argv[0];
-
-       switch_mutex_lock(globals.pvt_lock);
-       if (zstr(callid)) {
-               tech_pvt = globals.call_list;
-       } else {
-               tech_pvt = switch_core_hash_find(globals.call_hash, callid);
-       }
-
-       if (tech_pvt) {
-               switch_channel_hangup(switch_core_session_get_channel(tech_pvt->session), SWITCH_CAUSE_NORMAL_CLEARING);
-               stream->write_function(stream, "OK\n");
-       } else {
-               stream->write_function(stream, "NO SUCH CALL\n");
-       }
-       switch_mutex_unlock(globals.pvt_lock);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t answer_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       private_t *tp;
-       int x = 0;
-       char *callid = argv[0];
-
-       switch_mutex_lock(globals.pvt_lock);
-
-       if (!zstr(callid)) {
-               if ((tp = switch_core_hash_find(globals.call_hash, callid))) {
-                       if (switch_test_flag(tp, TFLAG_ANSWER)) {
-                               stream->write_function(stream, "CALL ALREADY ANSWERED\n");
-                       } else {
-                               switch_channel_t *channel = switch_core_session_get_channel(tp->session);
-                               switch_set_flag_locked(tp, TFLAG_ANSWER);
-                               if (tp != globals.call_list) {
-                                       remove_pvt(tp);
-                               }
-                               add_pvt(tp, PA_MASTER);
-                               switch_channel_mark_answered(channel);
-                       }
-               } else {
-                       stream->write_function(stream, "NO SUCH CALL\n");
-               }
-
-               goto done;
-       }
-
-       for (tp = globals.call_list; tp; tp = tp->next) {
-               if (!switch_test_flag(tp, TFLAG_ANSWER)) {
-                       switch_channel_t *channel = switch_core_session_get_channel(tp->session);
-                       switch_set_flag_locked(tp, TFLAG_ANSWER);
-                       add_pvt(tp, PA_MASTER);
-                       switch_channel_mark_answered(channel);
-                       x++;
-                       break;
-               }
-       }
-  done:
-       switch_mutex_unlock(globals.pvt_lock);
-       stream->write_function(stream, "Answered %d channels.\n", x);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t do_flags(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       char *action = argv[0];
-       char *flag_str;
-       GFLAGS flags = GFLAG_NONE;
-       char *p;
-       int x = 0;
-
-       if (argc < 2) {
-               goto desc;
-       }
-
-       for (x = 1; x < argc; x++) {
-               flag_str = argv[x];
-               for (p = flag_str; *p; p++) {
-                       *p = (char) tolower(*p);
-               }
-
-               if (strstr(flag_str, "ear")) {
-                       flags |= GFLAG_EAR;
-               }
-               if (strstr(flag_str, "mouth")) {
-                       flags |= GFLAG_MOUTH;
-               }
-       }
-
-       if (!strcasecmp(action, "on")) {
-               if (flags & GFLAG_EAR) {
-                       switch_set_flag((&globals), GFLAG_EAR);
-               }
-               if (flags & GFLAG_MOUTH) {
-                       switch_set_flag((&globals), GFLAG_MOUTH);
-               }
-       } else if (!strcasecmp(action, "off")) {
-               if (flags & GFLAG_EAR) {
-                       switch_clear_flag((&globals), GFLAG_EAR);
-               }
-               if (flags & GFLAG_MOUTH) {
-                       switch_clear_flag((&globals), GFLAG_MOUTH);
-               }
-       } else {
-               goto bad;
-       }
-
-  desc:
-       x = 0;
-       stream->write_function(stream, "FLAGS: ");
-       if (switch_test_flag((&globals), GFLAG_EAR)) {
-               stream->write_function(stream, "ear");
-               x++;
-       }
-       if (switch_test_flag((&globals), GFLAG_MOUTH)) {
-               stream->write_function(stream, "%smouth", x ? "|" : "");
-               x++;
-       }
-       if (!x) {
-               stream->write_function(stream, "none");
-       }
-
-       goto done;
-
-  bad:
-       stream->write_function(stream, "Usage: flags [on|off] <flags>\n");
-  done:
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t list_calls(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       private_t *tp;
-       int x = 0;
-       const char *cid_name = "n/a";
-       const char *cid_num = "n/a";
-
-       switch_mutex_lock(globals.pvt_lock);
-       for (tp = globals.call_list; tp; tp = tp->next) {
-               switch_channel_t *channel;
-               switch_caller_profile_t *profile;
-               x++;
-               channel = switch_core_session_get_channel(tp->session);
-
-               if ((profile = switch_channel_get_caller_profile(channel))) {
-                       if (profile->originatee_caller_profile) {
-                               cid_name = "Outbound Call";
-                               cid_num = profile->originatee_caller_profile->destination_number;
-                       } else {
-                               cid_name = profile->caller_id_name;
-                               cid_num = profile->caller_id_number;
-                       }
-               }
-
-               stream->write_function(stream, "%s %s [%s (%s)] %s\n", tp->call_id, switch_channel_get_name(channel),
-                                                          cid_name, cid_num, switch_test_flag(tp, TFLAG_MASTER) ? "active" : "hold");
-       }
-       switch_mutex_unlock(globals.pvt_lock);
-
-       stream->write_function(stream, "\n%d call%s\n", x, x == 1 ? "" : "s");
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t *stream)
-{
-       switch_core_session_t *session;
-       char *dest = NULL;
-
-       if (zstr(argv[0])) {
-               stream->write_function(stream, "FAIL:Usage: call <dest>\n");
-               return SWITCH_STATUS_SUCCESS;
-       }
-       dest = argv[0];
-
-       if ((session = switch_core_session_request(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, SOF_NONE, NULL)) != 0) {
-               private_t *tech_pvt;
-               switch_channel_t *channel;
-               char *dialplan = globals.dialplan;
-               char *context = globals.context;
-               char *cid_name = globals.cid_name;
-               char *cid_num = globals.cid_num;
-               char ip[25] = "0.0.0.0";
-
-               switch_core_session_add_stream(session, NULL);
-               if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) {
-                       memset(tech_pvt, 0, sizeof(*tech_pvt));
-                       switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-                       channel = switch_core_session_get_channel(session);
-                       switch_core_session_set_private(session, tech_pvt);
-                       tech_pvt->session = session;
-               } else {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
-                       switch_core_session_destroy(&session);
-                       return SWITCH_STATUS_MEMERR;
-               }
-
-               if (!zstr(argv[1])) {
-                       dialplan = argv[1];
-               }
-
-               if (!zstr(argv[2])) {
-                       cid_num = argv[2];
-               }
-
-               if (!zstr(argv[3])) {
-                       cid_name = argv[3];
-               }
-
-               if (!zstr(argv[4])) {
-                       tech_pvt->sample_rate = atoi(argv[4]);
-               }
-
-               if (!zstr(argv[5])) {
-                       tech_pvt->codec_ms = atoi(argv[5]);
-               }
-
-               switch_find_local_ip(ip, sizeof(ip), NULL, AF_INET);
-
-               if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
-                                                                                                                                 NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, context, dest)) != 0) {
-                       char name[128];
-                       switch_snprintf(name, sizeof(name), "portaudio/%s",
-                                                       tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname);
-                       switch_channel_set_name(channel, name);
-
-                       switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
-               }
-               tech_pvt->session = session;
-               if (validate_main_audio_stream() == SWITCH_STATUS_SUCCESS) {
-                       switch_set_flag_locked(tech_pvt, TFLAG_ANSWER);
-                       switch_channel_mark_answered(channel);
-                       switch_channel_set_state(channel, CS_INIT);
-                       if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
-                               switch_event_t *event;
-                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
-                               switch_core_session_destroy(&session);
-                               stream->write_function(stream, "FAIL:Thread Error!\n");
-                               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-                                       char buf[512];
-                                       switch_channel_event_set_data(channel, event);
-                                       switch_snprintf(buf, sizeof(buf), "Thread error!.\n");
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "error", buf);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "true");
-                                       switch_event_fire(&event);
-                               }
-                       } else {
-                               switch_event_t *event;
-                               add_pvt(tech_pvt, PA_MASTER);
-                               stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session));
-                               if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-                                       switch_channel_event_set_data(channel, event);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "false");
-                                       switch_event_fire(&event);
-                               }
-                       }
-               } else {
-                       switch_event_t *event;
-                       switch_core_session_destroy(&session);
-                       stream->write_function(stream, "FAIL:Device Error!\n");
-                       if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_MAKE_CALL) == SWITCH_STATUS_SUCCESS) {
-                               char buf[512];
-                               switch_channel_event_set_data(channel, event);
-                               switch_snprintf(buf, sizeof(buf), "Device fail.\n");
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "error", buf);
-                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fail", "true");
-                               switch_event_fire(&event);
-                       }
-               }
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(pa_cmd)
-{
-       char *argv[1024] = { 0 };
-       int argc = 0;
-       char *mycmd = NULL;
-       switch_status_t status = SWITCH_STATUS_SUCCESS;
-       pa_command_t func = NULL;
-       int devval;
-       int lead = 1;
-       char *wcmd = NULL, *action = NULL;
-       char cmd_buf[1024] = "";
-       char *http = NULL;
-
-       const char *usage_string = "USAGE:\n"
-               "--------------------------------------------------------------------------------\n"
-               "pa help\n"
-               "pa dump\n"
-               "pa rescan\n"
-               "pa call <dest> [<dialplan> <cid_name> <cid_num>]\n"
-               "pa answer [<call_id>]\n"
-               "pa hangup [<call_id>]\n"
-               "pa list\n"
-               "pa switch [<call_id>|none]\n"
-               "pa dtmf <digit string>\n"
-               "pa flags [on|off] [ear] [mouth]\n"
-               "pa devlist [xml]\n"
-               "pa indev #<num>|<partial name>\n"
-               "pa outdev #<num>|<partial name>\n"
-               "pa preparestream #<indev_num> #<outdev_num>\n"
-               "pa switchstream #<indev_num> #<outdev_num>\n"
-               "pa closestreams\n"
-               "pa ringdev #<num>|<partial name>\n"
-               "pa play [ringtest|<filename>] [seconds] [no_close]\n"
-               "pa playdev #<num> [ringtest|<filename>] [seconds] [no_close]\n"
-               "pa ringfile [filename]\n"
-               "pa looptest\n"
-               "pa shstreams\n"
-               "pa endpoints\n"
-               "--------------------------------------------------------------------------------\n";
-
-
-       if (stream->param_event) {
-               http = switch_event_get_header(stream->param_event, "http-host");
-       }
-
-       if (http) {
-               stream->write_function(stream, "Content-type: text/html\n\n");
-
-               wcmd = switch_str_nil(switch_event_get_header(stream->param_event, "wcmd"));
-               action = switch_event_get_header(stream->param_event, "action");
-
-               if (action) {
-                       if (strlen(action) == 1) {
-                               switch_snprintf(cmd_buf, sizeof(cmd_buf), "dtmf %s", action);
-                               cmd = cmd_buf;
-                       } else if (!strcmp(action, "mute")) {
-                               switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags off mouth");
-                               cmd = cmd_buf;
-                       } else if (!strcmp(action, "unmute")) {
-                               switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags on mouth");
-                               cmd = cmd_buf;
-                       } else if (!strcmp(action, "switch")) {
-                               switch_snprintf(cmd_buf, sizeof(cmd_buf), "switch %s", wcmd);
-                               cmd = cmd_buf;
-                       } else if (!strcmp(action, "call")) {
-                               switch_snprintf(cmd_buf, sizeof(cmd_buf), "call %s", wcmd);
-                               cmd = cmd_buf;
-                       } else if (!strcmp(action, "hangup") || !strcmp(action, "list") || !strcmp(action, "devlist") || !strcmp(action, "answer")) {
-                               cmd = action;
-                       }
-               }
-
-               if (zstr(cmd)) {
-                       goto done;
-               }
-
-       } else {
-
-               if (zstr(cmd)) {
-                       stream->write_function(stream, "%s", usage_string);
-                       goto done;
-               }
-       }
-
-       if (!(mycmd = strdup(cmd))) {
-               status = SWITCH_STATUS_MEMERR;
-               goto done;
-       }
-
-       if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
-               stream->write_function(stream, "%s", usage_string);
-               goto done;
-       }
-
-       if (!argv[0]) {
-               stream->write_function(stream, "Unknown Command\n");
-               goto done;
-       }
-
-       if (!strcasecmp(argv[0], "call")) {
-               func = place_call;
-       } else if (!strcasecmp(argv[0], "help")) {
-               stream->write_function(stream, "%s", usage_string);
-               goto done;
-       } else if (!strcasecmp(argv[0], "devlist")) {
-               func = devlist;
-       } else if (!strcasecmp(argv[0], "rescan")) {
-
-               if (globals.call_list) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n");
-                       goto done;
-               }
-
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Looking for new devices.\n");
-               dump_info(-1);
-               goto done;
-       } else if (!strcasecmp(argv[0], "dump")) {
-               dump_info(1);
-               goto done;
-       } else if (!strcasecmp(argv[0], "list")) {
-               func = list_calls;
-       } else if (!strcasecmp(argv[0], "flags")) {
-               func = do_flags;
-       } else if (!strcasecmp(argv[0], "hangup")) {
-               func = hangup_call;
-       } else if (!strcasecmp(argv[0], "answer")) {
-               func = answer_call;
-       } else if (!strcasecmp(argv[0], "switch")) {
-               func = switch_call;
-       } else if (!strcasecmp(argv[0], "dtmf")) {
-               func = dtmf_call;
-       } else if (!strcasecmp(argv[0], "closestreams")) {
-               func = close_streams;
-       } else if (argv[1] && !strcmp(argv[0], "indev")) {
-               func = set_indev;
-       } else if (argv[1] && !strcmp(argv[0], "outdev")) {
-               func = set_outdev;
-       } else if (argv[1] && argv[2] && !strcmp(argv[0], "preparestream")) {
-               func = prepare_stream;
-       } else if (argv[1] && argv[2] && !strcmp(argv[0], "switchstream")) {
-               func = switch_stream;
-       } else if (argv[1] && !strcmp(argv[0], "ringdev")) {
-               func = set_ringdev;
-       } else if ((argv[1] && !strcmp(argv[0], "play"))) {
-               if (validate_main_audio_stream() == SWITCH_STATUS_SUCCESS) {
-                       play_dev(stream, globals.main_stream ? globals.main_stream->outdev : -1,argv[1],argv[2], argv[3]);
-               }else{
-                       stream->write_function(stream, "Failed to engage audio device\n");
-               }
-               goto done;
-       } else if ((argv[1] && argv[2] && !strcmp(argv[0], "playdev"))) {
-               if (*argv[1] == '#') {
-                       devval = get_dev_by_number(argv[1] + 1, 0);
-               } else {
-                       devval = -1;
-               }
-               play_dev(stream, devval,argv[2],argv[3],argv[4]);
-               goto done;
-       } else if (!strcasecmp(argv[0], "looptest")) {
-               func = looptest;
-       } else if (!strcasecmp(argv[0], "ringfile")) {
-               func = set_ringfile;
-       } else if (!strcasecmp(argv[0], "shstreams")) {
-               func = list_shared_streams;
-       } else if (!strcasecmp(argv[0], "endpoints")) {
-               func = list_endpoints;
-       } else {
-               stream->write_function(stream, "Unknown Command or not enough args [%s]\n", argv[0]);
-       }
-
-
-       if (func) {
-               if (http) {
-                       stream->write_function(stream, "<pre>");
-               }
-
-               switch_mutex_lock(globals.pa_mutex);
-               func(&argv[lead], argc - lead, stream);
-               status = SWITCH_STATUS_SUCCESS; /*if func was defined we want to always return success as the command was found */
-               switch_mutex_unlock(globals.pa_mutex);
-
-               if (http) {
-                       stream->write_function(stream, "\n\n</pre>");
-               }
-       }
-
-  done:
-       if (http) {
-               stream->write_function(stream,
-                                                          "<br><br><table align=center><tr><td><center><form method=post>\n"
-                                                          "<input type=text name=wcmd size=40><br><br>\n"
-                                                          "<input name=action type=submit value=\"call\"> "
-                                                          "<input name=action type=submit value=\"hangup\"> "
-                                                          "<input name=action type=submit value=\"list\"> "
-                                                          "<input name=action type=submit value=\"switch\"> "
-                                                          "<input name=action type=submit value=\"mute\"> "
-                                                          "<input name=action type=submit value=\"unmute\"> "
-                                                          "<input name=action type=submit value=\"indev\"> "
-                                                          "<input name=action type=submit value=\"outdev\"> "
-                                                          "<input name=action type=submit value=\"devlist\"> <br> "
-                                                          "<input name=action type=submit value=\"preparestream\"> "
-                                                          "<input name=action type=submit value=\"switchstream\"> "
-                                                          "<input name=action type=submit value=\"closestreams\"> "
-                                                          "<input name=action type=submit value=\"ringdev\"> "
-                                                          "<input name=action type=submit value=\"play\"> "
-                                                          "<input name=action type=submit value=\"playdev\"> "
-                                                          "<input name=action type=submit value=\"answer\"> <br><br>"
-                                                          "<table border=1>\n"
-                                                          "<tr><td><input name=action type=submit value=\"1\"></td>"
-                                                          "<td><input name=action type=submit value=\"2\"></td>"
-                                                          "<td><input name=action type=submit value=\"3\"></td>\n"
-                                                          "<td><input name=action type=submit value=\"A\"></td></tr>\n"
-                                                          "<tr><td><input name=action type=submit value=\"4\"></td>"
-                                                          "<td><input name=action type=submit value=\"5\"></td>"
-                                                          "<td><input name=action type=submit value=\"6\"></td>\n"
-                                                          "<td><input name=action type=submit value=\"B\"></td></tr>\n"
-                                                          "<tr><td><input name=action type=submit value=\"7\"></td>"
-                                                          "<td><input name=action type=submit value=\"8\"></td>"
-                                                          "<td><input name=action type=submit value=\"9\"></td>\n"
-                                                          "<td><input name=action type=submit value=\"C\"></td></tr>\n"
-                                                          "<tr><td><input name=action type=submit value=\"*\"></td>"
-                                                          "<td><input name=action type=submit value=\"0\"></td>"
-                                                          "<td><input name=action type=submit value=\"#\"></td>\n"
-                                                          "<td><input name=action type=submit value=\"D\"></td></tr>\n" "</table>" "</form><br></center></td></tr></table>\n");
-       }
-
-       switch_safe_free(mycmd);
-       return status;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c

deleted file mode 100644 (file)

index 00e5f3a..0000000
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * $Id: pa_ringbuffer.c 1164 2006-12-21 15:34:50Z bjornroche $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on Mac OS X by Bjorn Roche
- * modified for SMP safety on Linux by Leland Lucius
- * also, allowed for const where possible
- * Note that this is safe only for a single-thread reader and a
- * single-thread writer.
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/**
- @file
- @ingroup common_src
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pa_ringbuffer.h"
-
-/****************
- * First, we'll define some memory barrier primitives based on the system.
- * right now only OS X, FreeBSD, and Linux are supported. In addition to providing
- * memory barriers, these functions should ensure that data cached in registers
- * is written out to cache where it can be snooped by other CPUs. (ie, the volatile
- * keyword should not be required)
- *
- * the primitives that must be defined are:
- *
- * PaUtil_FullMemoryBarrier()
- * PaUtil_ReadMemoryBarrier()
- * PaUtil_WriteMemoryBarrier()
- *
- ****************/
-#define __VIA_HACK__
-#if defined(__VIA_HACK__)
-#define NO_BARRIER
-#endif
-
-#if defined(NO_BARRIER)
-#   define PaUtil_FullMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier()
-#else
-
-#if defined(__APPLE__)                 //|| defined(__FreeBSD__)
-#   include <libkern/OSAtomic.h>
-       /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide
-          full memory barriers, so the three types of barriers are the same. */
-#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
-#elif defined(__GNUC__)
-
-       /* GCC understands volatile asm and "memory" to mean it
-        * should not reorder memory read/writes */
-#   if defined( __PPC__ )
-#      define PaUtil_FullMemoryBarrier()  __asm__ volatile("sync":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  __asm__ volatile("sync":::"memory")
-#      define PaUtil_WriteMemoryBarrier() __asm__ volatile("sync":::"memory")
-#   elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__)
-#      define PaUtil_FullMemoryBarrier()  __asm__ volatile("mfence":::"memory")
-#      define PaUtil_ReadMemoryBarrier()  __asm__ volatile("lfence":::"memory")
-#      define PaUtil_WriteMemoryBarrier() __asm__ volatile("sfence":::"memory")
-#   else
-#      define PaUtil_FullMemoryBarrier()
-#      define PaUtil_ReadMemoryBarrier()
-#      define PaUtil_WriteMemoryBarrier()
-#   endif
-#elif defined(_MSC_VER)
-#   include <intrin.h>
-#   pragma intrinsic(_ReadWriteBarrier)
-#   pragma intrinsic(_ReadBarrier)
-#   pragma intrinsic(_WriteBarrier)
-#   define PaUtil_FullMemoryBarrier()  _ReadWriteBarrier()
-#   define PaUtil_ReadMemoryBarrier()  _ReadBarrier()
-#   define PaUtil_WriteMemoryBarrier() _WriteBarrier()
-#else
-#   define PaUtil_FullMemoryBarrier()
-#   define PaUtil_ReadMemoryBarrier()
-#   define PaUtil_WriteMemoryBarrier()
-#endif
-#endif
-/***************************************************************************
- * Initialize FIFO.
- * numBytes must be power of 2, returns -1 if not.
- */
-long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr)
-{
-       if (((numBytes - 1) & numBytes) != 0)
-               return -1;                              /* Not Power of two. */
-       rbuf->bufferSize = numBytes;
-       rbuf->buffer = (char *) dataPtr;
-       PaUtil_FlushRingBuffer(rbuf);
-       rbuf->bigMask = (numBytes * 2) - 1;
-       rbuf->smallMask = (numBytes) - 1;
-       return 0;
-}
-
-/***************************************************************************
-** Return number of bytes available for reading. */
-long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf)
-{
-       PaUtil_ReadMemoryBarrier();
-       return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask);
-}
-
-/***************************************************************************
-** Return number of bytes available for writing. */
-long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf)
-{
-       /* Since we are calling PaUtil_GetRingBufferReadAvailable, we don't need an aditional MB */
-       return (rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf));
-}
-
-/***************************************************************************
-** Clear buffer. Should only be called when buffer is NOT being read. */
-void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf)
-{
-       rbuf->writeIndex = rbuf->readIndex = 0;
-}
-
-/***************************************************************************
-** Get address of region(s) to which we can write data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2)
-{
-       long index;
-       long available = PaUtil_GetRingBufferWriteAvailable(rbuf);
-       if (numBytes > available)
-               numBytes = available;
-       /* Check to see if write is not contiguous. */
-       index = rbuf->writeIndex & rbuf->smallMask;
-       if ((index + numBytes) > rbuf->bufferSize) {
-               /* Write data in two blocks that wrap the buffer. */
-               long firstHalf = rbuf->bufferSize - index;
-               *dataPtr1 = &rbuf->buffer[index];
-               *sizePtr1 = firstHalf;
-               *dataPtr2 = &rbuf->buffer[0];
-               *sizePtr2 = numBytes - firstHalf;
-       } else {
-               *dataPtr1 = &rbuf->buffer[index];
-               *sizePtr1 = numBytes;
-               *dataPtr2 = NULL;
-               *sizePtr2 = 0;
-       }
-       return numBytes;
-}
-
-
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes)
-{
-       /* we need to ensure that previous writes are seen before we update the write index */
-       PaUtil_WriteMemoryBarrier();
-       return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Get address of region(s) from which we can read data.
-** If the region is contiguous, size2 will be zero.
-** If non-contiguous, size2 will be the size of second region.
-** Returns room available to be written or numBytes, whichever is smaller.
-*/
-long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2)
-{
-       long index;
-       long available = PaUtil_GetRingBufferReadAvailable(rbuf);
-       if (numBytes > available)
-               numBytes = available;
-       /* Check to see if read is not contiguous. */
-       index = rbuf->readIndex & rbuf->smallMask;
-       if ((index + numBytes) > rbuf->bufferSize) {
-               /* Write data in two blocks that wrap the buffer. */
-               long firstHalf = rbuf->bufferSize - index;
-               *dataPtr1 = &rbuf->buffer[index];
-               *sizePtr1 = firstHalf;
-               *dataPtr2 = &rbuf->buffer[0];
-               *sizePtr2 = numBytes - firstHalf;
-       } else {
-               *dataPtr1 = &rbuf->buffer[index];
-               *sizePtr1 = numBytes;
-               *dataPtr2 = NULL;
-               *sizePtr2 = 0;
-       }
-       return numBytes;
-}
-
-/***************************************************************************
-*/
-long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes)
-{
-       /* we need to ensure that previous writes are always seen before updating the index. */
-       PaUtil_WriteMemoryBarrier();
-       return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
-}
-
-/***************************************************************************
-** Return bytes written. */
-long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes)
-{
-       long size1, size2, numWritten;
-       void *data1, *data2;
-       numWritten = PaUtil_GetRingBufferWriteRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
-       if (size2 > 0) {
-
-               memcpy(data1, data, size1);
-               data = ((char *) data) + size1;
-               memcpy(data2, data, size2);
-       } else {
-               memcpy(data1, data, size1);
-       }
-       PaUtil_AdvanceRingBufferWriteIndex(rbuf, numWritten);
-       return numWritten;
-}
-
-/***************************************************************************
-** Return bytes read. */
-long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes)
-{
-       long size1, size2, numRead;
-       void *data1, *data2;
-       numRead = PaUtil_GetRingBufferReadRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
-       if (size2 > 0) {
-               memcpy(data, data1, size1);
-               data = ((char *) data) + size1;
-               memcpy(data, data2, size2);
-       } else {
-               memcpy(data, data1, size1);
-       }
-       PaUtil_AdvanceRingBufferReadIndex(rbuf, numRead);
-       return numRead;
-}
diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h

deleted file mode 100644 (file)

index 05e0602..0000000
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef PA_RINGBUFFER_H
-#define PA_RINGBUFFER_H
-/*
- * $Id: pa_ringbuffer.h 1151 2006-11-29 02:11:16Z leland_lucius $
- * Portable Audio I/O Library
- * Ring Buffer utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- * modified for SMP safety on OS X by Bjorn Roche.
- * also allowed for const where possible.
- * Note that this is safe only for a single-thread reader
- * and a single-thread writer.
- *
- * This program is distributed with the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-/** @file
- @ingroup common_src
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif                                                 /* __cplusplus */
-
-       typedef struct PaUtilRingBuffer {
-               long bufferSize;                /* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */
-               long writeIndex;                /* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */
-               long readIndex;                 /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */
-               long bigMask;                   /* Used for wrapping indices with extra bit to distinguish full/empty. */
-               long smallMask;                 /* Used for fitting indices to buffer. */
-               char *buffer;
-       } PaUtilRingBuffer;
-
-/** Initialize Ring Buffer.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes in the buffer and must be power of 2.
-
- @param dataPtr A pointer to a previously allocated area where the data
- will be maintained.  It must be numBytes long.
-
- @return -1 if numBytes is not a power of 2, otherwise 0.
-*/
-       long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr);
-
-/** Clear buffer. Should only be called when buffer is NOT being read.
-
- @param rbuf The ring buffer.
-*/
-       void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf);
-
-/** Retrieve the number of bytes available in the ring buffer for writing.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for writing.
-*/
-       long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf);
-
-/** Retrieve the number of bytes available in the ring buffer for reading.
-
- @param rbuf The ring buffer.
-
- @return The number of bytes available for reading.
-*/
-       long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf);
-
-/** Write data to the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address of new data to write to the buffer.
-
- @param numBytes The number of bytes to be written.
-
- @return The number of bytes written.
-*/
-       long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes);
-
-/** Read data from the ring buffer.
-
- @param rbuf The ring buffer.
-
- @param data The address where the data should be stored.
-
- @param numBytes The number of bytes to be read.
-
- @return The number of bytes read.
-*/
-       long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes);
-
-/** Get address of region(s) to which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The room available to be written or numBytes, whichever is smaller.
-*/
-       long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
-
-/** Advance the write index to the next location to be written.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-       long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes);
-
-/** Get address of region(s) from which we can write data.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes desired.
-
- @param dataPtr1 The address where the first (or only) region pointer will be
- stored.
-
- @param sizePtr1 The address where the first (or only) region length will be
- stored.
-
- @param dataPtr2 The address where the second region pointer will be stored if
- the first region is too small to satisfy numBytes.
-
- @param sizePtr2 The address where the second region length will be stored if
- the first region is too small to satisfy numBytes.
-
- @return The number of bytes available for reading.
-*/
-       long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
-
-/** Advance the read index to the next location to be read.
-
- @param rbuf The ring buffer.
-
- @param numBytes The number of bytes to advance.
-
- @return The new position.
-*/
-       long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes);
-
-#ifdef __cplusplus
-}
-#endif                                                 /* __cplusplus */
-#endif                                                 /* PA_RINGBUFFER_H */
diff --git a/src/mod/endpoints/mod_portaudio/pablio.c b/src/mod/endpoints/mod_portaudio/pablio.c

deleted file mode 100644 (file)

index aae15eb..0000000
--- a/src/mod/endpoints/mod_portaudio/pablio.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * $Id: pablio.c 1151 2006-11-29 02:11:16Z leland_lucius $
- * pablio.c
- * Portable Audio Blocking Input/Output utility.
- *
- * Author: Phil Burk, http://www.softsynth.com
- *
- * This program uses the PortAudio Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-#include <switch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <portaudio.h>
-#include "pa_ringbuffer.h"
-#include "pablio.h"
-
-/************************************************************************/
-/******** Prototypes ****************************************************/
-/************************************************************************/
-
-static int iblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-                                                          unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-                                                          void *userData);
-static int oblockingIOCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo,
-                                                          PaStreamCallbackFlags statusFlags, void *userData);
-
-static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-                                                               unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-                                                               void *userData);
-
-static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame);
-static PaError PABLIO_TermFIFO(PaUtilRingBuffer * rbuf);
-
-/************************************************************************/
-/******** Functions *****************************************************/
-/************************************************************************/
-
-/* Called from PortAudio.
- * Read and write data
- */
-static int iblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-                                                          unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-{
-       int c = 0, i = 0, j = 0;
-       PABLIO_Stream *data = (PABLIO_Stream *) userData;
-       long numBytes = data->bytesPerFrame * framesPerBuffer;
-       const int16_t *inputSamples = inputBuffer;
-       int16_t *chanSamples = (int16_t*)data->iobuff;
-
-       /* This may get called with NULL inputBuffer during initial setup. */
-       if (inputBuffer != NULL) {
-               /* retrieve the data for each channel and put it in the ring buffer */
-               for (c = 0; c < data->channelCount; c++) {
-                       for (i = 0, j = c; i < (int)framesPerBuffer; j += data->channelCount, i++) {
-                               chanSamples[i] = inputSamples[j];
-                       }
-                       if (PaUtil_WriteRingBuffer(&data->inFIFOs[c], chanSamples, numBytes) != numBytes) {
-                               PaUtil_FlushRingBuffer(&data->inFIFOs[c]);
-                               PaUtil_WriteRingBuffer(&data->inFIFOs[c], chanSamples, numBytes);
-                       }
-               }
-       }
-
-       return 0;
-}
-
-static int oblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-                                                          unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData)
-{
-       PABLIO_Stream *data = (PABLIO_Stream *) userData;
-       long numBytes = data->bytesPerFrame * framesPerBuffer;
-       int16_t *outputSamples = outputBuffer;
-       int16_t *chanSamples = (short *)data->iobuff;
-       int c = 0, i = 0, j = 0;
-
-       if (outputBuffer != NULL) {
-               for (c = 0; c < data->channelCount; c++) {
-                       int numRead = PaUtil_ReadRingBuffer(&data->outFIFOs[c], chanSamples, numBytes);
-                       numRead = numRead / sizeof(int16_t);
-                       for (i = 0, j = c; i < (int)framesPerBuffer; j += data->channelCount, i++) {
-                               if (i < numRead) {
-                                       outputSamples[j] = chanSamples[i];
-                               } else {
-                                       outputSamples[j] = 0;
-                               }
-                       }
-               }
-       }
-
-       return 0;
-}
-
-static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer,
-                                                               unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags,
-                                                               void *userData)
-{
-       iblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData);
-       oblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData);
-       return 0;
-}
-
-/* Allocate buffer. */
-static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame)
-{
-       long numBytes = numFrames * bytesPerFrame;
-       char *buffer = (char *) malloc(numBytes);
-       if (buffer == NULL)
-               return paInsufficientMemory;
-       memset(buffer, 0, numBytes);
-       return (PaError) PaUtil_InitializeRingBuffer(rbuf, numBytes, buffer);
-}
-
-/* Free buffer. */
-static PaError PABLIO_TermFIFO(PaUtilRingBuffer * rbuf)
-{
-       if (rbuf->buffer)
-               free(rbuf->buffer);
-       rbuf->buffer = NULL;
-       return paNoError;
-}
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer)
-{
-       long bytesWritten;
-       char *p = (char *) data;
-       long numBytes = aStream->bytesPerFrame * numFrames;
-
-       switch_core_timer_next(timer);
-
-       bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFOs[chan], p, numBytes);
-       numBytes -= bytesWritten;
-
-       if (numBytes > 0) {
-               PaUtil_FlushRingBuffer(&aStream->outFIFOs[chan]);
-               return 0;
-       }
-       return numFrames;
-}
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer)
-{
-       long bytesRead = 0;
-       char *p = (char *) data;
-       long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames;
-       int max = 5000;
-
-       switch_core_timer_next(timer);
-
-       while (totalBytes < neededBytes && --max > 0) {
-
-               avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFOs[chan]);
-               //printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max);
-               if (avail >= neededBytes * 6) {
-                       PaUtil_FlushRingBuffer(&aStream->inFIFOs[chan]);
-               } else {
-
-                       bytesRead = 0;
-
-                       if (totalBytes < neededBytes && avail >= neededBytes) {
-                               bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFOs[chan], p, neededBytes);
-                               totalBytes += bytesRead;
-                       }
-
-                       if (bytesRead) {
-                               p += bytesRead;
-                       } else {
-                               switch_cond_next();
-                       }
-               }
-       }
-
-       return totalBytes / aStream->bytesPerFrame;
-}
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable(PABLIO_Stream * aStream, int chan)
-{
-       int bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[chan]);
-       return bytesEmpty / aStream->bytesPerFrame;
-}
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable(PABLIO_Stream * aStream, int chan)
-{
-       int bytesFull = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFOs[chan]);
-       return bytesFull / aStream->bytesPerFrame;
-}
-
-/***********************************************************/
-static unsigned long RoundUpToNextPowerOf2(unsigned long n)
-{
-       long numBits = 0;
-       if (((n - 1) & n) == 0)
-               return n;
-       while (n > 0) {
-               n = n >> 1;
-               numBits++;
-       }
-       return (1 << numBits);
-}
-
-
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- */
-PaError OpenAudioStream(PABLIO_Stream ** rwblPtr,
-                                               const PaStreamParameters * inputParameters,
-                                               const PaStreamParameters * outputParameters, double sampleRate, PaStreamFlags streamFlags, long samples_per_packet, int do_dual)
-{
-       long bytesPerSample = 2;
-       PaError err;
-       PABLIO_Stream *aStream;
-       long numFrames;
-       //long numBytes;
-       int c = 0;
-       int channels = 1;
-
-       if (!(inputParameters || outputParameters)) {
-               return -1;
-       }
-
-       /* Allocate PABLIO_Stream structure for caller. */
-       aStream = (PABLIO_Stream *) malloc(sizeof(PABLIO_Stream));
-       switch_assert(aStream);
-       memset(aStream, 0, sizeof(PABLIO_Stream));
-
-       if (inputParameters) {
-               channels = inputParameters->channelCount;
-       } else if (outputParameters) {
-               channels = outputParameters->channelCount;
-       }
-
-       numFrames = RoundUpToNextPowerOf2(samples_per_packet * 5);
-       aStream->bytesPerFrame = bytesPerSample;
-       aStream->channelCount = channels;
-
-       /* Initialize Ring Buffers */
-
-       if (inputParameters) {
-               for (c = 0; c < channels; c++) {
-                       err = PABLIO_InitFIFO(&aStream->inFIFOs[c], numFrames, aStream->bytesPerFrame);
-                       if (err != paNoError) {
-                               goto error;
-                       }
-               }
-               aStream->has_in = 1;
-       }
-
-       if (outputParameters) {
-               for (c = 0; c < channels; c++) {
-                       err = PABLIO_InitFIFO(&aStream->outFIFOs[c], numFrames, aStream->bytesPerFrame);
-                       if (err != paNoError) {
-                               goto error;
-                       }
-               }
-               aStream->has_out = 1;
-       }
-
-       /* Open a PortAudio stream that we will use to communicate with the underlying
-        * audio drivers. */
-
-       aStream->do_dual = do_dual;
-
-       if (aStream->do_dual) {
-               err = Pa_OpenStream(&aStream->istream, inputParameters, NULL, sampleRate, samples_per_packet, streamFlags, iblockingIOCallback, aStream);
-               if (err != paNoError) {
-                       goto error;
-               }
-               err = Pa_OpenStream(&aStream->ostream, NULL, outputParameters, sampleRate, samples_per_packet, streamFlags, oblockingIOCallback, aStream);
-               if (err != paNoError) {
-                       goto error;
-               }
-       } else {
-               err =
-                       Pa_OpenStream(&aStream->iostream, inputParameters, outputParameters, sampleRate, samples_per_packet, streamFlags, ioblockingIOCallback,
-                                                 aStream);
-       }
-
-       if (err != paNoError) {
-               goto error;
-       }
-
-       if (aStream->do_dual) {
-               err = Pa_StartStream(aStream->istream);
-
-               if (err != paNoError) {
-                       goto error;
-               }
-
-               err = Pa_StartStream(aStream->ostream);
-
-               if (err != paNoError) {
-                       goto error;
-               }
-
-       } else {
-               err = Pa_StartStream(aStream->iostream);
-       }
-
-       if (err != paNoError) {
-               goto error;
-       }
-
-       *rwblPtr = aStream;
-
-       switch_yield(500000);
-
-       return paNoError;
-
-  error:
-
-       CloseAudioStream(aStream);
-
-       *rwblPtr = NULL;
-       return err;
-}
-
-/************************************************************/
-PaError CloseAudioStream(PABLIO_Stream * aStream)
-{
-       int bytesEmpty;
-       int byteSize;
-       int c = 0;
-
-
-       if (aStream->has_out) {
-
-               for (c = 0; c < aStream->channelCount; c++) {
-                       byteSize = aStream->outFIFOs[c].bufferSize;
-
-                       /* If we are writing data, make sure we play everything written. */
-                       if (byteSize > 0) {
-                               bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[c]);
-                               while (bytesEmpty < byteSize) {
-                                       Pa_Sleep(10);
-                                       bytesEmpty = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFOs[c]);
-                               }
-                       }
-               }
-       }
-
-       if (aStream->do_dual) {
-               if (aStream->has_in && aStream->istream) {
-                       if (Pa_IsStreamActive(aStream->istream)) {
-                               Pa_StopStream(aStream->istream);
-                       }
-
-                       Pa_CloseStream(aStream->istream);
-                       aStream->istream = NULL;
-               }
-
-               if (aStream->has_out && aStream->ostream) {
-                       if (Pa_IsStreamActive(aStream->ostream)) {
-                               Pa_StopStream(aStream->ostream);
-                       }
-
-                       Pa_CloseStream(aStream->ostream);
-                       aStream->ostream = NULL;
-               }
-
-       } else {
-               if (aStream->iostream) {
-                       if (Pa_IsStreamActive(aStream->iostream)) {
-                               Pa_StopStream(aStream->iostream);
-                       }
-
-                       Pa_CloseStream(aStream->iostream);
-                       aStream->iostream = NULL;
-               }
-       }
-
-       if (aStream->has_in) {
-               for (c = 0; c < aStream->channelCount; c++) {
-                       PABLIO_TermFIFO(&aStream->inFIFOs[c]);
-               }
-       }
-
-       if (aStream->has_out) {
-               for (c = 0; c < aStream->channelCount; c++) {
-                       PABLIO_TermFIFO(&aStream->outFIFOs[c]);
-               }
-       }
-
-       free(aStream);
-       switch_yield(500000);
-
-       return paNoError;
-}
-
diff --git a/src/mod/endpoints/mod_portaudio/pablio.h b/src/mod/endpoints/mod_portaudio/pablio.h

deleted file mode 100644 (file)

index c40aac7..0000000
--- a/src/mod/endpoints/mod_portaudio/pablio.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef PORTAUDIO_PABLIO_H
-#define PORTAUDIO_PABLIO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif                                                 /* __cplusplus */
-
-/*
- * $Id: pablio.h 1083 2006-08-23 07:30:49Z rossb $
- * PABLIO.h
- * Portable Audio Blocking read/write utility.
- *
- * Author: Phil Burk, http://www.softsynth.com/portaudio/
- *
- * Include file for PABLIO, the Portable Audio Blocking I/O Library.
- * PABLIO is built on top of PortAudio, the Portable Audio Library.
- * For more information see: http://www.portaudio.com
- * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * The text above constitutes the entire PortAudio license; however,
- * the PortAudio community also makes the following non-binding requests:
- *
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
- * license above.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <portaudio.h>
-#include "pa_ringbuffer.h"
-
-/*! Maximum number of channels per stream */
-#define MAX_IO_CHANNELS 2
-
-/*! Maximum numer of milliseconds per packet */
-#define MAX_IO_MS 100
-
-/*! Maximum sampling rate (48Khz) */
-#define MAX_SAMPLING_RATE  48000
-
-/* Maximum size of a read */
-#define MAX_IO_BUFFER (((MAX_IO_MS * MAX_SAMPLING_RATE)/1000)*sizeof(int16_t))
-typedef struct {
-       PaStream *istream;
-       PaStream *ostream;
-       PaStream *iostream;
-       int bytesPerFrame;
-       int do_dual;
-       int has_in;
-       int has_out;
-       PaUtilRingBuffer inFIFOs[MAX_IO_CHANNELS];
-       PaUtilRingBuffer outFIFOs[MAX_IO_CHANNELS];
-       int channelCount;
-       char iobuff[MAX_IO_BUFFER];
-} PABLIO_Stream;
-
-/* Values for flags for OpenAudioStream(). */
-#define PABLIO_READ     (1<<0)
-#define PABLIO_WRITE    (1<<1)
-#define PABLIO_READ_WRITE    (PABLIO_READ|PABLIO_WRITE)
-#define PABLIO_MONO     (1<<2)
-#define PABLIO_STEREO   (1<<3)
-
-/************************************************************
- * Write data to ring buffer.
- * Will not return until all the data has been written.
- */
-long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer);
-
-/************************************************************
- * Read data from ring buffer.
- * Will not return until all the data has been read.
- */
-long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int chan, switch_timer_t *timer);
-
-/************************************************************
- * Return the number of frames that could be written to the stream without
- * having to wait.
- */
-long GetAudioStreamWriteable(PABLIO_Stream * aStream, int chan);
-
-/************************************************************
- * Return the number of frames that are available to be read from the
- * stream without having to wait.
- */
-long GetAudioStreamReadable(PABLIO_Stream * aStream, int chan);
-
-/************************************************************
- * Opens a PortAudio stream with default characteristics.
- * Allocates PABLIO_Stream structure.
- *
- * flags parameter can be an ORed combination of:
- *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
- *    and either PABLIO_MONO or PABLIO_STEREO
- */
-PaError OpenAudioStream(PABLIO_Stream ** rwblPtr,
-                       const PaStreamParameters * inputParameters,
-                       const PaStreamParameters * outputParameters,
-                       double sampleRate, PaStreamCallbackFlags statusFlags, long samples_per_packet, int do_dual);
-
-PaError CloseAudioStream(PABLIO_Stream * aStream);
-
-#ifdef __cplusplus
-}
-#endif                                                 /* __cplusplus */
-#endif                                                 /* _PABLIO_H */
diff --git a/src/mod/formats/mod_portaudio_stream/Makefile.am b/src/mod/formats/mod_portaudio_stream/Makefile.am

deleted file mode 100644 (file)

index 207a1b7..0000000
--- a/src/mod/formats/mod_portaudio_stream/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_portaudio_stream
-MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio
-
-if HAVE_PORTAUDIO
-mod_LTLIBRARIES = mod_portaudio_stream.la
-mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c ../../endpoints/mod_portaudio/pablio.c ../../endpoints/mod_portaudio/pa_ringbuffer.c
-mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_stream_la_CPPFLAGS = -I. -I$(MODPA_DIR) $(PORTAUDIO_CFLAGS) $(AM_CPPFLAGS)
-mod_portaudio_stream_la_LIBADD = $(PORTAUDIO_LIBS) $(switch_builddir)/libfreeswitch.la
-mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-if ISMAC
-mod_portaudio_stream_la_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
-endif
-else
-install: error
-all: error
-error:
-       $(error You must install portaudio19-dev to build $(MODNAME))
-endif
diff --git a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c

deleted file mode 100644 (file)

index e0878a0..0000000
--- a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * mod_portaudio_stream.c -- Portaudio Streaming interface Audio
- *
- */
-#include "switch.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "pablio.h"
-
-#define DEFAULT_PREBUFFER_SIZE 1024 * 64
-#define SAMPLE_TYPE  paInt16
-#define PREFERRED_RATE  8000
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_stream_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_stream_shutdown);
-SWITCH_MODULE_DEFINITION(mod_portaudio_stream, mod_portaudio_stream_load, mod_portaudio_stream_shutdown, NULL);
-static switch_memory_pool_t *module_pool = NULL;
-
-struct portaudio_stream_source;
-
-static struct {
-       int running;
-       int threads;
-       switch_mutex_t *mutex;
-       switch_hash_t *source_hash;
-
-} globals;
-
-
-struct portaudio_stream_context {
-       struct portaudio_stream_source *source;
-       switch_mutex_t *audio_mutex;
-       switch_buffer_t *audio_buffer;
-       int err;
-       const char *func;
-       const char *file;
-       int line;
-       switch_file_handle_t *handle;
-       struct portaudio_stream_context *next;
-};
-
-typedef struct portaudio_stream_context portaudio_stream_context_t;
-
-struct portaudio_stream_source {
-       char *sourcename;
-       int sourcedev;
-       int rate;
-       int interval;
-       char *timer_name;
-       int total;
-       int ready;
-       int stopped;
-       uint8_t channels;
-       switch_size_t samples;
-       uint32_t prebuf;
-       portaudio_stream_context_t *context_list;
-       switch_mutex_t *mutex;
-       switch_memory_pool_t *pool;
-       switch_thread_rwlock_t *rwlock;
-       PABLIO_Stream *audio_stream;
-       switch_frame_t read_frame;
-       switch_timer_t timer;
-       switch_codec_t read_codec;
-       switch_codec_t write_codec;
-       switch_mutex_t *device_lock;
-       unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-};
-
-typedef struct portaudio_stream_source portaudio_stream_source_t;
-
-
-
-static int get_dev_by_number(char *numstr, int in)
-{
-       int numDevices = Pa_GetDeviceCount();
-       const PaDeviceInfo *pdi;
-       char *end_ptr;
-       int number;
-
-       number = (int) strtol(numstr, &end_ptr, 10);
-
-       if (end_ptr == numstr || number < 0) {
-               return -1;
-       }
-
-       if (number > -1 && number < numDevices && (pdi = Pa_GetDeviceInfo(number))) {
-               if (in && pdi->maxInputChannels) {
-                       return number;
-               } else if (!in && pdi->maxOutputChannels) {
-                       return number;
-               }
-       }
-
-       return -1;
-}
-
-static int get_dev_by_name(char *name, int in)
-{
-       int i;
-       int numDevices;
-       const PaDeviceInfo *pdi;
-       numDevices = Pa_GetDeviceCount();
-
-       if (numDevices < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
-               return -2;
-       }
-
-       for (i = 0; i < numDevices; i++) {
-               int match = 0;
-               pdi = Pa_GetDeviceInfo(i);
-
-               if (zstr(name)) {
-                       match = 1;
-               } else if (pdi && pdi->name && strstr(pdi->name, name)) {
-                       match = 1;
-               }
-
-               if (match) {
-                       if (in && pdi->maxInputChannels) {
-                               return i;
-                       } else if (!in && pdi->maxOutputChannels) {
-                               return i;
-                       }
-               }
-       }
-
-       return -1;
-}
-
-static switch_status_t engage_device(portaudio_stream_source_t *source, int restart)
-{
-       PaStreamParameters inputParameters, outputParameters;
-       PaError err;
-       int sample_rate = source->rate;
-       int codec_ms = source->interval;
-
-       switch_mutex_init(&source->device_lock, SWITCH_MUTEX_NESTED, module_pool);
-
-       if (source->timer.timer_interface) {
-               switch_core_timer_sync(&source->timer);
-       }
-
-       if (source->audio_stream) {
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       if (!switch_core_codec_ready(&source->read_codec)) {
-               if (switch_core_codec_init(&source->read_codec,
-                                                                  "L16",
-                                                                  NULL, NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-                                                                  NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-       switch_assert(source->read_codec.implementation);
-
-       if (!switch_core_codec_ready(&source->write_codec)) {
-               if (switch_core_codec_init(&source->write_codec,
-                                                                  "L16",
-                                                                  NULL, NULL,
-                                                                  sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
-                       switch_core_codec_destroy(&source->read_codec);
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-
-       if (!source->timer.timer_interface) {
-               if (switch_core_timer_init(&source->timer,
-                                                                  source->timer_name, codec_ms, source->read_codec.implementation->samples_per_packet,
-                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-                       switch_core_codec_destroy(&source->read_codec);
-                       switch_core_codec_destroy(&source->write_codec);
-                       return SWITCH_STATUS_FALSE;
-               }
-       }
-
-       source->read_frame.rate = sample_rate;
-       source->read_frame.codec = &source->read_codec;
-
-       switch_mutex_lock(source->device_lock);
-       /* LOCKED ************************************************************************************************** */
-       inputParameters.device = source->sourcedev;
-       inputParameters.channelCount = 1;
-       inputParameters.sampleFormat = SAMPLE_TYPE;
-       inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency;
-       inputParameters.hostApiSpecificStreamInfo = NULL;
-       outputParameters.device = source->sourcedev;
-       outputParameters.channelCount = 1;
-       outputParameters.sampleFormat = SAMPLE_TYPE;
-       outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
-       outputParameters.hostApiSpecificStreamInfo = NULL;
-
-
-       err = OpenAudioStream(&source->audio_stream, &inputParameters, NULL, sample_rate, paClipOff, source->read_codec.implementation->samples_per_packet, 0);
-       /* UNLOCKED ************************************************************************************************* */
-       if (err != paNoError) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening audio device retrying\n");
-               switch_yield(1000000);
-               err = OpenAudioStream(&source->audio_stream, &inputParameters, &outputParameters, sample_rate, paClipOff,
-                                                         source->read_codec.implementation->samples_per_packet, 0);
-       }
-
-       switch_mutex_unlock(source->device_lock);
-       if (err != paNoError) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n");
-               switch_core_codec_destroy(&source->read_codec);
-               switch_core_timer_destroy(&source->timer);
-               return SWITCH_STATUS_FALSE;
-       }
-
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj)
-{
-       portaudio_stream_source_t *source = obj;
-       portaudio_stream_context_t *cp;
-       int samples;
-       int bused, bytesToWrite;
-
-
-       switch_mutex_lock(globals.mutex);
-       globals.threads++;
-       switch_mutex_unlock(globals.mutex);
-
-       if (!source->prebuf) {
-               source->prebuf = DEFAULT_PREBUFFER_SIZE;
-       }
-
-
-
-       switch_mutex_lock(globals.mutex);
-       switch_core_hash_insert(globals.source_hash, source->sourcename, source);
-       switch_mutex_unlock(globals.mutex);
-
-
-       switch_thread_rwlock_create(&source->rwlock, source->pool);
-
-       if (engage_device(source, 0) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, " Dev %d cant be engaged !\n", (int) source->sourcedev);
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " Dev %d engaged at %d rate!\n", (int) source->sourcedev, (int) source->rate);
-               if (globals.running && !source->stopped) {
-                       source->ready = 1;
-
-                       if (!source->audio_stream) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Audio Stream wops!\n");
-                               source->stopped = 0;
-                               source->ready = 0;
-                       } else {
-                               while (globals.running && !source->stopped) {
-                                       switch_mutex_lock(source->device_lock);
-                                       samples = ReadAudioStream(source->audio_stream, source->databuf,
-                                                                 source->read_codec.implementation->samples_per_packet, 0, &source->timer);
-                                       switch_mutex_unlock(source->device_lock);
-
-
-                                       if (samples) {
-                                               bytesToWrite = source->samples;
-                                               if (samples < bytesToWrite) {
-                                                       bytesToWrite = samples;
-                                               }
-                                               bytesToWrite *= source->audio_stream->bytesPerFrame;
-
-                                               if (source->total) {
-
-                                                       switch_mutex_lock(source->mutex);
-                                                       for (cp = source->context_list; cp; cp = cp->next) {
-
-                                                               switch_mutex_lock(cp->audio_mutex);
-
-                                                               bused = switch_buffer_inuse(cp->audio_buffer);
-                                                               if (bused > source->samples * 768) {
-                                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Leaking stream handle! [%s() %s:%d] %d used %d max\n",
-                                                                                                         cp->func, cp->file, cp->line, (int) bused, (int) (source->samples * 768));
-                                                                       switch_buffer_zero(cp->audio_buffer);
-                                                               } else {
-                                                                       switch_buffer_write(cp->audio_buffer, source->databuf, bytesToWrite);
-                                                               }
-
-                                                               switch_mutex_unlock(cp->audio_mutex);
-                                                       }
-                                                       switch_mutex_unlock(source->mutex);
-                                               }
-
-                                       }
-
-                               }
-                       }
-
-               }
-       }
-
-
-       source->ready = 0;
-
-       switch_mutex_lock(globals.mutex);
-       switch_core_hash_delete(globals.source_hash, source->sourcename);
-       switch_mutex_unlock(globals.mutex);
-
-       switch_thread_rwlock_wrlock(source->rwlock);
-       switch_thread_rwlock_unlock(source->rwlock);
-
-
-       switch_mutex_lock(source->device_lock);
-       CloseAudioStream(source->audio_stream);
-       if (switch_core_codec_ready(&source->read_codec)) {
-               switch_core_codec_destroy(&source->read_codec);
-               switch_core_codec_destroy(&source->write_codec);
-       }
-       if (switch_core_codec_ready(&source->write_codec)) {
-               switch_core_codec_destroy(&source->write_codec);
-       }
-       switch_mutex_unlock(source->device_lock);
-
-
-       switch_core_destroy_memory_pool(&source->pool);
-
-       switch_mutex_lock(globals.mutex);
-       globals.threads--;
-       switch_mutex_unlock(globals.mutex);
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " thread ending succesfully !\n");
-       switch_thread_exit(thread, SWITCH_STATUS_SUCCESS);
-
-       return NULL;
-}
-
-
-static switch_status_t portaudio_stream_file_open(switch_file_handle_t *handle, const char *path)
-{
-       portaudio_stream_context_t *context;
-       portaudio_stream_source_t *source;
-       switch_memory_pool_t *pool;
-       switch_status_t status = SWITCH_STATUS_FALSE;
-       switch_thread_t *thread;
-       switch_threadattr_t *thd_attr = NULL;
-       uint32_t rate = PREFERRED_RATE;
-       char *npath;
-       int devNumber;
-       int tmp;
-
-       handle->pre_buffer_datalen = 0;
-
-       if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing! (yet)\n");
-               return status;
-       }
-
-       npath = switch_core_strdup(module_pool, path);
-
-       tmp = handle->samplerate;
-       if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) {
-               rate = tmp;
-       }
-
-       if (*path == '#') {
-               devNumber = get_dev_by_number(npath + 1, 1);
-       } else {
-               devNumber = get_dev_by_name(npath, 1);
-       }
-       npath = switch_mprintf("device-%d at %d", devNumber, rate);
-
-       switch_mutex_lock(globals.mutex);
-       source = switch_core_hash_find(globals.source_hash, npath);
-
-       /* dev isnt there, try to start thread */
-       if (!source) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " source isnt Created, create and start thread!\n");
-
-               if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, " :S no pool\n");
-               } else {
-                       source = switch_core_alloc(pool, sizeof(*source));
-                       if (source != NULL) {
-                               source->pool = pool;
-                               source->sourcedev = devNumber;
-                               source->sourcename = switch_core_strdup(source->pool, npath);
-                               source->rate = rate;
-                               source->interval = 20;
-                               source->channels = 1;
-                               source->timer_name = "soft";
-                               source->prebuf = DEFAULT_PREBUFFER_SIZE;
-                               source->stopped = 0;
-                               source->ready = 0;
-                               source->samples = switch_samples_per_packet(source->rate, source->interval);
-
-                               switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool);
-
-                               switch_threadattr_create(&thd_attr, source->pool);
-                               switch_threadattr_detach_set(thd_attr, 1);
-
-                               switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-                               switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool);
-                       }
-               }
-       }
-       switch_mutex_unlock(globals.mutex);
-       switch_yield(1000000);
-       /* dev already engaged */
-       if (source) {
-
-               /*wait for source to be ready */
-               while (source->ready == 0) {
-                       switch_yield(100000);
-               }
-
-               if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " error rwlock !\n");
-                       source = NULL;
-               }
-       }
-
-       if (source) {
-               status = SWITCH_STATUS_SUCCESS;
-
-               if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " error allocating context!\n");
-                       status = SWITCH_STATUS_MEMERR;
-               } else {
-                       /* everything goes fine at this point */
-                       handle->samples = 0;
-                       handle->samplerate = source->rate;
-                       handle->channels = 1;
-                       handle->format = 0;
-                       handle->sections = 0;
-                       handle->seekable = 0;
-                       handle->speed = 0;
-                       handle->private_info = context;
-                       handle->interval = source->interval;
-
-                       switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
-                       if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
-                               status = SWITCH_STATUS_MEMERR;
-                       } else {
-                               /* context created... then continue */
-                               context->source = source;
-                               context->file = handle->file;
-                               context->func = handle->func;
-                               context->line = handle->line;
-                               context->handle = handle;
-                               switch_mutex_lock(source->mutex);
-                               context->next = source->context_list;
-                               source->context_list = context;
-                               source->total++;
-                               switch_mutex_unlock(source->mutex);
-                       }
-               }
-       } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown source %s\n", path);
-               status = SWITCH_STATUS_FALSE;
-       }
-
-       return status;
-}
-
-
-static switch_status_t portaudio_stream_file_close(switch_file_handle_t *handle)
-{
-       portaudio_stream_context_t *cp, *last = NULL, *context = handle->private_info;
-
-
-       switch_mutex_lock(context->source->mutex);
-       for (cp = context->source->context_list; cp; cp = cp->next) {
-               if (cp == context) {
-                       if (last) {
-                               last->next = cp->next;
-                       } else {
-                               context->source->context_list = cp->next;
-                       }
-                       break;
-               }
-               last = cp;
-       }
-       context->source->total--;
-       switch_mutex_unlock(context->source->mutex);
-       switch_buffer_destroy(&context->audio_buffer);
-       switch_thread_rwlock_unlock(context->source->rwlock);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t portaudio_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len)
-{
-       portaudio_stream_context_t *context = handle->private_info;
-       switch_size_t bytes = 0;
-       int bytesPerSample = context->source->audio_stream->bytesPerFrame;
-       size_t need = *len * bytesPerSample;
-
-       if (!context->source->ready) {
-               *len = 0;
-               return SWITCH_STATUS_FALSE;
-       }
-
-       switch_mutex_lock(context->audio_mutex);
-       if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) {
-               *len = bytes / bytesPerSample;
-       } else {
-               if (need > 2560) {
-                       need = 2560;
-               }
-               memset(data, 255, need);
-               *len = need / bytesPerSample;
-       }
-       switch_mutex_unlock(context->audio_mutex);
-
-
-
-       handle->sample_count += *len;
-       return SWITCH_STATUS_SUCCESS;
-
-
-}
-
-/* Registration */
-
-static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
-
-static void shutdown_event_handler(switch_event_t *event)
-{
-       globals.running = 0;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_stream_load)
-{
-       switch_file_interface_t *file_interface;
-       supported_formats[0] = "portaudio_stream";
-
-       module_pool = pool;
-
-       Pa_Initialize();
-
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-       file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
-       file_interface->interface_name = modname;
-       file_interface->extens = supported_formats;
-       file_interface->file_open = portaudio_stream_file_open;
-       file_interface->file_close = portaudio_stream_file_close;
-       file_interface->file_read = portaudio_stream_file_read;
-
-       if (switch_event_bind(modname, SWITCH_EVENT_SHUTDOWN, SWITCH_EVENT_SUBCLASS_ANY, shutdown_event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind shutdown event handler!\n");
-       }
-
-       memset(&globals, 0, sizeof(globals));
-       globals.running = 1;
-       globals.threads = 0;
-       switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
-       switch_core_hash_init(&globals.source_hash);
-
-
-       /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_portaudio_stream_shutdown)
-{
-       globals.running = 0;
-       switch_event_unbind_callback(shutdown_event_handler);
-
-       while (globals.threads > 0) {
-               switch_yield(100000);
-       }
-
-       Pa_Terminate();
-
-       switch_core_hash_destroy(&globals.source_hash);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj

index 5bd65cfa18418c53b392a4e1dd48e94802dcb266..3540628eda1defc0e9a37462b259140fea3d31ec 100644 (file)
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -529,14 +529,6 @@
        <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
        <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
      </ProjectReference>\r
-    <ProjectReference Include="..\..\src\mod\endpoints\mod_portaudio\mod_PortAudio.2017.vcxproj">\r
-      <Name>mod_PortAudio</Name>\r
-      <Project>{5fd31a25-5d83-4794-8bee-904dad84ce71}</Project>\r
-      <Private>True</Private>\r
-      <DoNotHarvest>True</DoNotHarvest>\r
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
-    </ProjectReference>\r
      <ProjectReference Include="..\..\src\mod\endpoints\mod_rtc\mod_rtc.2017.vcxproj">\r
        <Name>mod_rtc</Name>\r
        <Project>{3884add2-91d0-4cd6-86d3-d5fb2d4aab9e}</Project>\r
diff --git a/w32/Setup/inno_setup/fscomm.iss b/w32/Setup/inno_setup/fscomm.iss

index 56c28874eb3760b0e0f9c03864940c23d55570a8..6e21f8caa3c014a8720185e54dbd1e42ecfa8dfa 100644 (file)
--- a/w32/Setup/inno_setup/fscomm.iss
+++ b/w32/Setup/inno_setup/fscomm.iss
@@ -66,7 +66,6 @@ Source: {#FreeSWITCH_32bit}\mod\mod_event_socket.dll; DestDir: {app}\mod; Flags:
  Source: {#FreeSWITCH_32bit}\mod\mod_ilbc.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
  Source: {#FreeSWITCH_32bit}\mod\mod_local_stream.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
  Source: {#FreeSWITCH_32bit}\mod\mod_loopback.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
-Source: {#FreeSWITCH_32bit}\mod\mod_PortAudio.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
  Source: {#FreeSWITCH_32bit}\mod\mod_siren.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
  Source: {#FreeSWITCH_32bit}\mod\mod_sndfile.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
  Source: {#FreeSWITCH_32bit}\mod\mod_sofia.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
diff --git a/w32/download_portaudio.props b/w32/download_portaudio.props

deleted file mode 100644 (file)

index 8a9b160..0000000
--- a/w32/download_portaudio.props
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
-  </ImportGroup>
-  <PropertyGroup>
-    <downloadportaudioPropsImported>true</downloadportaudioPropsImported>
-  </PropertyGroup>
-
-  <!--
-       Download Target.
-       Name must be unique.
-       By design, targets are executed only once per project.
-
-       Usage:
-
-       package: URI
-
-       expectfileordirectory: Skips the download and extraction if exists
-
-       outputfolder: Folder to store a downloaded file.
-                     By default "$(BaseDir)libs", if empty
-
-       outputfilename: If not empty, overrides filename from URI.
-                       .exe files don't get extracted
-
-       extractto: Folder to extract an archive to
-   -->
-
-  <Target Name="portaudioDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
-      <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz"
-           expectfileordirectory="$(BaseDir)libs\portaudio\Makefile.in"
-           outputfolder=""
-           outputfilename=""
-           extractto="$(BaseDir)libs\"
-      />
-  </Target>
-
-</Project>
author	Andrey Volk <andywolk@gmail.com>
	Wed, 28 Aug 2024 17:35:10 +0000 (20:35 +0300)
committer	Andrey Volk <andywolk@gmail.com>
	Tue, 7 Jan 2025 16:18:03 +0000 (19:18 +0300)
Freeswitch.2017.sln		patch \| blob \| blame \| history
LICENSE		patch \| blob \| blame \| history
build/modules.conf.in		patch \| blob \| blame \| history
build/modules.conf.most		patch \| blob \| blame \| history
conf/curl/autoload_configs/portaudio.conf.xml	[deleted file]	patch \| blob \| blame \| history
conf/insideout/autoload_configs/modules.conf.xml		patch \| blob \| blame \| history
conf/insideout/autoload_configs/portaudio.conf.xml	[deleted file]	patch \| blob \| blame \| history
conf/vanilla/autoload_configs/modules.conf.xml		patch \| blob \| blame \| history
conf/vanilla/autoload_configs/portaudio.conf.xml	[deleted file]	patch \| blob \| blame \| history
conf/vanilla/dialplan/default.xml		patch \| blob \| blame \| history
configure.ac		patch \| blob \| blame \| history
debian/bootstrap.sh		patch \| blob \| blame \| history
debian/control-modules		patch \| blob \| blame \| history
debian/copyright		patch \| blob \| blame \| history
freeswitch.spec		patch \| blob \| blame \| history
libs/.gitignore		patch \| blob \| blame \| history
libs/win32/portaudio/portaudio.2017.vcxproj	[deleted file]	patch \| blob \| blame \| history
src/mod/.gitignore		patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/Makefile.am	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/conf/autoload_configs/portaudio.conf.xml	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/mod_PortAudio.2017.vcxproj	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/mod_portaudio.c	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/pa_ringbuffer.c	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/pa_ringbuffer.h	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/pablio.c	[deleted file]	patch \| blob \| blame \| history
src/mod/endpoints/mod_portaudio/pablio.h	[deleted file]	patch \| blob \| blame \| history
src/mod/formats/mod_portaudio_stream/Makefile.am	[deleted file]	patch \| blob \| blame \| history
src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c	[deleted file]	patch \| blob \| blame \| history
w32/Setup/Setup.2017.wixproj		patch \| blob \| blame \| history
w32/Setup/inno_setup/fscomm.iss		patch \| blob \| blame \| history
w32/download_portaudio.props	[deleted file]	patch \| blob \| blame \| history