<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15541] </title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15541">15541</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-11-19 08:20:53 -0600 (Thu, 19 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>skypiax: no more pipes for audio samples exchange between threads. Let's hope it does not breaks things around. Only other possible cause of audio delay is socket buffering. We'll check that too. </pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (15540 => 15541)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c        2009-11-19 10:21:59 UTC (rev 15540)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c        2009-11-19 14:20:53 UTC (rev 15541)
</span><span class="lines">@@ -741,10 +741,22 @@
</span><span class="cx"> 
</span><span class="cx">         sent = frame-&gt;datalen;
</span><span class="cx"> #ifdef WIN32
</span><del>-        switch_file_write(tech_pvt-&gt;audioskypepipe[1], frame-&gt;data, &amp;sent);
</del><ins>+        //switch_file_write(tech_pvt-&gt;audiopipe_cli[1], frame-&gt;data, &amp;sent);
</ins><span class="cx"> #else /* WIN32 */
</span><del>-        sent = write(tech_pvt-&gt;audioskypepipe[1], frame-&gt;data, sent);
</del><ins>+        //sent = write(tech_pvt-&gt;audiopipe_cli[1], frame-&gt;data, sent);
</ins><span class="cx"> #endif /* WIN32 */
</span><ins>+                                        while(tech_pvt-&gt;flag_audio_cli == 1){
+                                                switch_sleep(100); //1 millisec
+                                                //NOTICA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+                                                }
+                                                //WARNINGA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+
+
+        //memcpy(tech_pvt-&gt;audiobuf_cli, frame-&gt;data, frame-&gt;datalen);
+        memcpy(tech_pvt-&gt;audiobuf_cli, frame-&gt;data, frame-&gt;datalen);
+        tech_pvt-&gt;flag_audio_cli = 1;
+        //NOTICA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+
</ins><span class="cx">         if (sent != frame-&gt;datalen &amp;&amp; sent != -1) {
</span><span class="cx">                 DEBUGA_SKYPE(&quot;CLI PIPE write %d\n&quot;, SKYPIAX_P_LOG, sent);
</span><span class="cx">         }
</span><span class="lines">@@ -1420,7 +1432,7 @@
</span><span class="cx"> static switch_status_t chat_send(const char *proto, const char *from, const char *to, const char *subject, const char *body, const char *type, const char *hint)
</span><span class="cx"> {
</span><span class="cx">         //char *user, *host, *f_user = NULL, *ffrom = NULL, *f_host = NULL, *f_resource = NULL;
</span><del>-        char *user, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
</del><ins>+        char *user=NULL, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL;
</ins><span class="cx">         //mdl_profile_t *profile = NULL;
</span><span class="cx">         private_t * tech_pvt=NULL;
</span><span class="cx">         int i=0, found=0, tried=0;
</span><span class="lines">@@ -1629,14 +1641,14 @@
</span><span class="cx">                         }
</span><span class="cx"> #ifndef WIN32
</span><span class="cx">                         WARNINGA(&quot;SHUTDOWN interface_id=%d\n&quot;, SKYPIAX_P_LOG, interface_id);
</span><del>-                        shutdown(tech_pvt-&gt;audioskypepipe[0], 2);
-                        close(tech_pvt-&gt;audioskypepipe[0]);
-                        shutdown(tech_pvt-&gt;audioskypepipe[1], 2);
-                        close(tech_pvt-&gt;audioskypepipe[1]);
-                        shutdown(tech_pvt-&gt;audiopipe[0], 2);
-                        close(tech_pvt-&gt;audiopipe[0]);
-                        shutdown(tech_pvt-&gt;audiopipe[1], 2);
-                        close(tech_pvt-&gt;audiopipe[1]);
</del><ins>+                        shutdown(tech_pvt-&gt;audiopipe_cli[0], 2);
+                        close(tech_pvt-&gt;audiopipe_cli[0]);
+                        shutdown(tech_pvt-&gt;audiopipe_cli[1], 2);
+                        close(tech_pvt-&gt;audiopipe_cli[1]);
+                        shutdown(tech_pvt-&gt;audiopipe_srv[0], 2);
+                        close(tech_pvt-&gt;audiopipe_srv[0]);
+                        shutdown(tech_pvt-&gt;audiopipe_srv[1], 2);
+                        close(tech_pvt-&gt;audiopipe_srv[1]);
</ins><span class="cx">                         shutdown(tech_pvt-&gt;SkypiaxHandles.fdesc[0], 2);
</span><span class="cx">                         close(tech_pvt-&gt;SkypiaxHandles.fdesc[0]);
</span><span class="cx">                         shutdown(tech_pvt-&gt;SkypiaxHandles.fdesc[1], 2);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (15540 => 15541)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h        2009-11-19 10:21:59 UTC (rev 15540)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h        2009-11-19 14:20:53 UTC (rev 15541)
</span><span class="lines">@@ -229,12 +229,12 @@
</span><span class="cx">         int skype;                                        /*!&lt; \brief config flag, bool, Skype support on this interface (0 if false, -1 if true) */
</span><span class="cx">         int control_to_send;
</span><span class="cx"> #ifdef WIN32
</span><del>-        switch_file_t *audiopipe[2];
-        switch_file_t *audioskypepipe[2];
</del><ins>+        switch_file_t *audiopipe_srv[2];
+        switch_file_t *audiopipe_cli[2];
</ins><span class="cx">         switch_file_t *skypiax_sound_capt_fd;        /*!&lt; \brief file descriptor for sound capture dev */
</span><span class="cx"> #else                                                        /* WIN32 */
</span><del>-        int audiopipe[2];
-        int audioskypepipe[2];
</del><ins>+        int audiopipe_srv[2];
+        int audiopipe_cli[2];
</ins><span class="cx">         int skypiax_sound_capt_fd;        /*!&lt; \brief file descriptor for sound capture dev */
</span><span class="cx"> #endif                                                        /* WIN32 */
</span><span class="cx">         switch_thread_t *tcp_srv_thread;
</span><span class="lines">@@ -243,6 +243,12 @@
</span><span class="cx">         switch_thread_t *skypiax_api_thread;
</span><span class="cx">         short audiobuf[SAMPLES_PER_FRAME];
</span><span class="cx">         int audiobuf_is_loaded;
</span><ins>+        short audiobuf_cli[SAMPLES_PER_FRAME];
+        switch_mutex_t *mutex_audio_cli;
+        int flag_audio_cli;
+        short audiobuf_srv[SAMPLES_PER_FRAME];
+        switch_mutex_t *mutex_audio_srv;
+        int flag_audio_srv;
</ins><span class="cx"> 
</span><span class="cx">         //int phonebook_listing;
</span><span class="cx">         //int phonebook_querying;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (15540 => 15541)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c        2009-11-19 10:21:59 UTC (rev 15540)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c        2009-11-19 14:20:53 UTC (rev 15541)
</span><span class="lines">@@ -786,7 +786,18 @@
</span><span class="cx">                                                                         i++;
</span><span class="cx">                                                                 }
</span><span class="cx">                                                                 /* send the complete frame through the pipe to our code waiting for incoming audio */
</span><del>-                                                                howmany = skypiax_pipe_write(tech_pvt-&gt;audiopipe[1], totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+                                                                //howmany = skypiax_pipe_write(tech_pvt-&gt;audiopipe_srv[1], totalbuf, SAMPLES_PER_FRAME * sizeof(short));
+                                        while(tech_pvt-&gt;flag_audio_srv == 1){
+                                                switch_sleep(100); //1 millisec
+                                                //NOTICA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+                                                }
+                                                //WARNINGA(&quot;read \n&quot;, SKYPIAX_P_LOG);
+
+
+                                                                howmany = SAMPLES_PER_FRAME * sizeof(short);
+                                                                memcpy(tech_pvt-&gt;audiobuf_srv, totalbuf, SAMPLES_PER_FRAME * sizeof(short));
+                                                                tech_pvt-&gt;flag_audio_srv = 1;
+                                                                //NOTICA(&quot;read \n&quot;, SKYPIAX_P_LOG);
</ins><span class="cx">                                                                 if (howmany != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx">                                                                         ERRORA(&quot;howmany is %d, but was expected to be %d\n&quot;, SKYPIAX_P_LOG,
</span><span class="cx">                                                                                    howmany, (int) (SAMPLES_PER_FRAME * sizeof(short)));
</span><span class="lines">@@ -811,15 +822,24 @@
</span><span class="cx"> 
</span><span class="cx">                                 /* let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die */
</span><span class="cx">                                 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>-                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe_srv[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx">                                 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>-                                len = skypiax_pipe_write(tech_pvt-&gt;audioskypepipe[1], kill_cli_buff, kill_cli_size);
-                                tech_pvt-&gt;interface_state = SKYPIAX_STATE_DOWN;
</del><ins>+                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe_cli[1], kill_cli_buff, kill_cli_size);
+                                //tech_pvt-&gt;interface_state = SKYPIAX_STATE_DOWN;
</ins><span class="cx">                                 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>-                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe_srv[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx">                                 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short);
</span><del>-                                len = skypiax_pipe_write(tech_pvt-&gt;audioskypepipe[1], kill_cli_buff, kill_cli_size);
</del><ins>+                                len = skypiax_pipe_write(tech_pvt-&gt;audiopipe_cli[1], kill_cli_buff, kill_cli_size);
</ins><span class="cx"> 
</span><ins>+                                tech_pvt-&gt;flag_audio_cli = 1; //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
+                                skypiax_sleep(200);
+                                tech_pvt-&gt;flag_audio_srv = 1; //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
+                                skypiax_sleep(200);
+                                tech_pvt-&gt;interface_state = SKYPIAX_STATE_DOWN;
+                                tech_pvt-&gt;flag_audio_cli = 1; //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
+                                skypiax_sleep(200);
+                                tech_pvt-&gt;flag_audio_srv = 1; //let's send some frame in the pipes, so both tcp_cli and tcp_srv will have an occasion to die
+                                skypiax_sleep(200);
</ins><span class="cx">                                 DEBUGA_SKYPE(&quot;Skype incoming audio GONE\n&quot;, SKYPIAX_P_LOG);
</span><span class="cx">                                 skypiax_close_socket(fd);
</span><span class="cx">                         }
</span><span class="lines">@@ -893,8 +913,8 @@
</span><span class="cx">                         while (s &gt; 0 &amp;&amp; (fd = accept(s, (struct sockaddr *) &amp;remote_addr, &amp;sin_size)) &gt; 0) {
</span><span class="cx">                                 DEBUGA_SKYPE(&quot;ACCEPTED here you send me %d\n&quot;, SKYPIAX_P_LOG, tech_pvt-&gt;tcp_cli_port);
</span><span class="cx"> #ifndef WIN32
</span><del>-                                fcntl(tech_pvt-&gt;audioskypepipe[0], F_SETFL, O_NONBLOCK);
-                                fcntl(tech_pvt-&gt;audioskypepipe[1], F_SETFL, O_NONBLOCK);
</del><ins>+                                fcntl(tech_pvt-&gt;audiopipe_cli[0], F_SETFL, O_NONBLOCK);
+                                fcntl(tech_pvt-&gt;audiopipe_cli[1], F_SETFL, O_NONBLOCK);
</ins><span class="cx"> #endif //WIN32
</span><span class="cx"> 
</span><span class="cx">                                 if (!(running &amp;&amp; tech_pvt-&gt;running))
</span><span class="lines">@@ -918,22 +938,43 @@
</span><span class="cx">                                         fdselect = fd;
</span><span class="cx">                                         FD_SET(fdselect, &amp;fs);
</span><span class="cx"> 
</span><del>-                                        rt = select(fdselect + 1, NULL, &amp;fs, NULL, &amp;to);
</del><ins>+                                        //rt = select(fdselect + 1, NULL, &amp;fs, NULL, &amp;to);
</ins><span class="cx"> #else
</span><span class="cx"> /* on *unix and cygwin we select from the real pipe */
</span><del>-                                        fdselect = tech_pvt-&gt;audioskypepipe[0];
-                                        FD_SET(fdselect, &amp;fs);
</del><ins>+                                        //XXX fdselect = tech_pvt-&gt;audiopipe_cli[0];
+                                        //XXX FD_SET(fdselect, &amp;fs);
</ins><span class="cx"> 
</span><del>-                                        rt = select(fdselect + 1, &amp;fs, NULL, NULL, &amp;to);
</del><ins>+                                        //rt = select(fdselect + 1, &amp;fs, NULL, NULL, &amp;to);
</ins><span class="cx"> #endif
</span><ins>+                                        fdselect = fd;
+                                        FD_SET(fdselect, &amp;fs);
</ins><span class="cx"> 
</span><ins>+                                        //XXX rt = select(fdselect + 1, NULL, &amp;fs, NULL, &amp;to);
+                                        while(tech_pvt-&gt;flag_audio_cli == 0){
+                                                skypiax_sleep(100); //1 millisec
+                                                //NOTICA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+                                                }
+                                                //ERRORA(&quot;write \n&quot;, SKYPIAX_P_LOG);
+
+                                        rt = 1;
+
</ins><span class="cx">                                         if (rt &gt; 0) {
</span><span class="cx">                                                 int counter;
</span><span class="cx"> 
</span><span class="cx">                                                 /* until we drained the pipe to empty */
</span><del>-                                                for (counter = 0; counter &lt; 10; counter++) {
</del><ins>+                                                //for (counter = 0; counter &lt; 10; counter++) {
+                                                for (counter = 0; counter &lt; 1; counter++) {
</ins><span class="cx">                                                         /* read from the pipe the audio frame we are supposed to send out */
</span><del>-                                                        got = skypiax_pipe_read(tech_pvt-&gt;audioskypepipe[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+                                                        //got = skypiax_pipe_read(tech_pvt-&gt;audiopipe_cli[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
+
+
+                                                        got = SAMPLES_PER_FRAME * sizeof(short);
+                                                        memcpy(cli_in, tech_pvt-&gt;audiobuf_cli, SAMPLES_PER_FRAME * sizeof(short));
+                                                        tech_pvt-&gt;flag_audio_cli = 0;
+
+
+
+
</ins><span class="cx">                                                         if (got == -1)
</span><span class="cx">                                                                 break;
</span><span class="cx"> 
</span><span class="lines">@@ -1015,7 +1056,15 @@
</span><span class="cx"> {
</span><span class="cx">         unsigned int samples;
</span><span class="cx"> 
</span><del>-        samples = skypiax_pipe_read(tech_pvt-&gt;audiopipe[0], tech_pvt-&gt;read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+        while(tech_pvt-&gt;flag_audio_srv == 0){
+                skypiax_sleep(100); //1 millisec
+                //NOTICA(&quot;read \n&quot;, SKYPIAX_P_LOG);
+                }
+                //ERRORA(&quot;read \n&quot;, SKYPIAX_P_LOG);
+        //samples = skypiax_pipe_read(tech_pvt-&gt;audiopipe_srv[0], tech_pvt-&gt;read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
+        samples = SAMPLES_PER_FRAME * sizeof(short);
+        memcpy(tech_pvt-&gt;read_frame.data, tech_pvt-&gt;audiobuf_srv, SAMPLES_PER_FRAME * sizeof(short));
+        tech_pvt-&gt;flag_audio_srv = 0;
</ins><span class="cx"> 
</span><span class="cx">         if (samples != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx">                 if (samples)
</span><span class="lines">@@ -1100,8 +1149,8 @@
</span><span class="cx"> int skypiax_audio_init(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx">         switch_status_t rv;
</span><del>-        rv = switch_file_pipe_create(&amp;tech_pvt-&gt;audiopipe[0], &amp;tech_pvt-&gt;audiopipe[1], skypiax_module_pool);
-        rv = switch_file_pipe_create(&amp;tech_pvt-&gt;audioskypepipe[0], &amp;tech_pvt-&gt;audioskypepipe[1], skypiax_module_pool);
</del><ins>+        rv = switch_file_pipe_create(&amp;tech_pvt-&gt;audiopipe_srv[0], &amp;tech_pvt-&gt;audiopipe_srv[1], skypiax_module_pool);
+        rv = switch_file_pipe_create(&amp;tech_pvt-&gt;audiopipe_cli[0], &amp;tech_pvt-&gt;audiopipe_cli[1], skypiax_module_pool);
</ins><span class="cx">         return 0;
</span><span class="cx"> }
</span><span class="cx"> #else /* WIN32 */
</span><span class="lines">@@ -1132,17 +1181,17 @@
</span><span class="cx"> 
</span><span class="cx"> int skypiax_audio_init(private_t * tech_pvt)
</span><span class="cx"> {
</span><del>-        if (pipe(tech_pvt-&gt;audiopipe)) {
-                fcntl(tech_pvt-&gt;audiopipe[0], F_SETFL, O_NONBLOCK);
-                fcntl(tech_pvt-&gt;audiopipe[1], F_SETFL, O_NONBLOCK);
</del><ins>+        if (pipe(tech_pvt-&gt;audiopipe_srv)) {
+                fcntl(tech_pvt-&gt;audiopipe_srv[0], F_SETFL, O_NONBLOCK);
+                fcntl(tech_pvt-&gt;audiopipe_srv[1], F_SETFL, O_NONBLOCK);
</ins><span class="cx">         }
</span><del>-        if (pipe(tech_pvt-&gt;audioskypepipe)) {
-                fcntl(tech_pvt-&gt;audioskypepipe[0], F_SETFL, O_NONBLOCK);
-                fcntl(tech_pvt-&gt;audioskypepipe[1], F_SETFL, O_NONBLOCK);
</del><ins>+        if (pipe(tech_pvt-&gt;audiopipe_cli)) {
+                fcntl(tech_pvt-&gt;audiopipe_cli[0], F_SETFL, O_NONBLOCK);
+                fcntl(tech_pvt-&gt;audiopipe_cli[1], F_SETFL, O_NONBLOCK);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> /* this pipe is the audio fd for asterisk to poll on during a call. FS do not use it */
</span><del>-        tech_pvt-&gt;skypiax_sound_capt_fd = tech_pvt-&gt;audiopipe[0];
</del><ins>+        tech_pvt-&gt;skypiax_sound_capt_fd = tech_pvt-&gt;audiopipe_srv[0];
</ins><span class="cx"> 
</span><span class="cx">         return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>