<!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][15795] </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=15795">15795</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-04 15:23:09 -0600 (Fri, 04 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>code before decl and whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodformatsmod_portaudio_streammod_portaudio_streamc">freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodformatsmod_portaudio_streammod_portaudio_streamc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c (15794 => 15795)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c 2009-12-04 20:54:15 UTC (rev 15794)
+++ freeswitch/trunk/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c 2009-12-04 21:23:09 UTC (rev 15795)
</span><span class="lines">@@ -374,11 +374,8 @@
</span><span class="cx"> uint32_t rate = PREFERRED_RATE;
</span><span class="cx"> char *npath ;
</span><span class="cx"> int devNumber;
</span><ins>+ int tmp;
</ins><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> handle->pre_buffer_datalen = 0;
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
</span><span class="lines">@@ -388,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> npath = switch_core_strdup(module_pool, path);
</span><span class="cx">
</span><del>- int tmp = handle->samplerate;
</del><ins>+ tmp = handle->samplerate;
</ins><span class="cx"> if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) {
</span><span class="cx"> rate = tmp;
</span><span class="cx"> }
</span><span class="lines">@@ -400,8 +397,6 @@
</span><span class="cx"> }
</span><span class="cx"> npath = switch_mprintf("device-%d at %d",devNumber,rate);
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="cx"> source = switch_core_hash_find(globals.source_hash, npath);
</span><span class="cx">
</span><span class="lines">@@ -426,22 +421,15 @@
</span><span class="cx"> source->ready = 0;
</span><span class="cx"> source->samples = switch_samples_per_packet(source->rate, source->interval);
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool);
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> switch_threadattr_create(&thd_attr, source->pool);
</span><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span><span class="cx">
</span><span class="cx"> switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
</span><span class="cx"> switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool);
</span><del>-
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> switch_yield(1000000);
</span><span class="lines">@@ -449,19 +437,16 @@
</span><span class="cx"> if (source) {
</span><span class="cx">
</span><span class="cx"> /*wait for source to be ready*/
</span><ins>+ while(source->ready==0) {
+ switch_yield(100000);
+ }
</ins><span class="cx">
</span><del>- while(source->ready==0){switch_yield(100000);}
-
-
</del><span class="cx"> if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, " error rwlock !\n");
</span><span class="cx"> source = NULL;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> if (source) {
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="lines">@@ -480,7 +465,6 @@
</span><span class="cx"> handle->private_info = context;
</span><span class="cx"> handle->interval = source->interval;
</span><span class="cx">
</span><del>-
</del><span class="cx"> switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
</span><span class="cx"> if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</span><span class="lines">@@ -497,7 +481,6 @@
</span><span class="cx"> source->context_list = context;
</span><span class="cx"> source->total++;
</span><span class="cx"> switch_mutex_unlock(source->mutex);
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -505,8 +488,6 @@
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -544,8 +525,6 @@
</span><span class="cx"> int bytesPerSample = context->source->audio_stream->bytesPerFrame;
</span><span class="cx"> size_t need = *len * bytesPerSample;
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> if (!context->source->ready) {
</span><span class="cx"> *len = 0;
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>