<!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][14683] </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=14683">14683</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-30 14:44:25 -0500 (Sun, 30 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: initialize alsa only at module loading, and give the serial monitoring loop a breach where other threads can enter</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc">freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14682 => 14683)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-30 05:30:19 UTC (rev 14682)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-30 19:44:25 UTC (rev 14683)
</span><span class="lines">@@ -253,15 +253,6 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int res;
- res = alsa_init(tech_pvt);
- if (res == -1) {
- ERRORA("Failed initializing sound device\n", SKYPIAX_P_LOG);
- /* we failed, free the PVT */
- //if (tmp)
- //free(tmp);
- //return NULL;
- }
</del><span class="cx"> //teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, tech_pvt->read_codec.implementation->actual_samples_per_second);
</span><span class="cx"> teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, 8000);
</span><span class="cx">
</span><span class="lines">@@ -479,7 +470,6 @@
</span><span class="cx">
</span><span class="cx"> switch_core_timer_destroy(&tech_pvt->timer);
</span><span class="cx">
</span><del>- alsa_shutdown(tech_pvt);
</del><span class="cx">
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
</span><span class="lines">@@ -1514,7 +1504,6 @@
</span><span class="cx">
</span><span class="cx"> switch_sleep(100000);
</span><span class="cx">
</span><del>-#ifdef NOTDEF
</del><span class="cx"> res = alsa_init(&globals.SKYPIAX_INTERFACES[interface_id]);
</span><span class="cx"> if (res == -1) {
</span><span class="cx"> ERRORA("Failed initializing sound device\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -1524,6 +1513,7 @@
</span><span class="cx"> //return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef NOTDEF
</ins><span class="cx"> switch_threadattr_create(&celliax_signaling_thread_attr, celliax_module_pool);
</span><span class="cx"> switch_threadattr_stacksize_set(celliax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
</span><span class="cx"> switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread, celliax_signaling_thread_attr,
</span><span class="lines">@@ -1654,6 +1644,10 @@
</span><span class="cx"> tech_pvt = &globals.SKYPIAX_INTERFACES[interface_id];
</span><span class="cx">
</span><span class="cx"> if (strlen(globals.SKYPIAX_INTERFACES[interface_id].name)) {
</span><ins>+
+
+
+ alsa_shutdown(&globals.SKYPIAX_INTERFACES[interface_id]);
</ins><span class="cx"> if (globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread) {
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> switch_file_write(tech_pvt->SkypiaxHandles.fdesc[1], "sciutati", &howmany); // let's the controldev_thread die
</span><span class="lines">@@ -2386,6 +2380,7 @@
</span><span class="cx"> //FIXME ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
</span><span class="cx"> //FIXME }
</span><span class="cx"> }
</span><ins>+usleep(100); //give other threads a chance
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>