<!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][16155] </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=16155">16155</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-05 12:22:58 -0600 (Tue, 05 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: no_sound per interface config variable (when you are just interested to send/receive SMSs (eg: if no sound device is available). continue to implement workaround for no CNMI (unsolicited message for incoming SMS) and no PDU mode. YOU DON'T WANT THIS ONE :-)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopenh">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp">freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopenh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (16154 => 16155)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-05 15:55:24 UTC (rev 16154)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-05 18:22:58 UTC (rev 16155)
</span><span class="lines">@@ -445,6 +445,8 @@
</span><span class="cx"> teletone_dtmf_detect_state_t dtmf_detect;
</span><span class="cx"> switch_time_t old_dtmf_timestamp;
</span><span class="cx">
</span><ins>+ int no_sound;
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16154 => 16155)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-05 15:55:24 UTC (rev 16154)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-05 18:22:58 UTC (rev 16155)
</span><span class="lines">@@ -2725,6 +2725,9 @@
</span><span class="cx"> snd_pcm_sframes_t delayp1;
</span><span class="cx"> snd_pcm_sframes_t delayp2;
</span><span class="cx">
</span><ins>+ if(tech_pvt->no_sound==1){
+ return res;
+ }
</ins><span class="cx"> //ERRORA("data=%p, datalen=%d\n", GSMOPEN_P_LOG, (void *)data, datalen);
</span><span class="cx"> /* We have to digest the frame in 160-byte portions */
</span><span class="cx"> if (datalen > sizeof(sizbuf) - sizpos) {
</span><span class="lines">@@ -2940,6 +2943,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+ if(tech_pvt->no_sound==1){
+ return r;
+ }
</ins><span class="cx">
</span><span class="cx"> left = datalen;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16154 => 16155)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-05 15:55:24 UTC (rev 16154)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-05 18:22:58 UTC (rev 16155)
</span><span class="lines">@@ -263,10 +263,12 @@
</span><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><del>- if (alsa_init(tech_pvt)) {
- ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
- return SWITCH_STATUS_FALSE;
</del><ins>+ if(tech_pvt->no_sound==0){
+ if (alsa_init(tech_pvt)) {
+ ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
</ins><span class="cx">
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
</span><span class="cx"> SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -495,7 +497,9 @@
</span><span class="cx"> switch_core_timer_destroy(&tech_pvt->timer_read);
</span><span class="cx"> switch_core_timer_destroy(&tech_pvt->timer_write);
</span><span class="cx">
</span><ins>+ if(tech_pvt->no_sound==0){
</ins><span class="cx"> alsa_shutdown(tech_pvt);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
</span><span class="lines">@@ -717,7 +721,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (samples != 160) {
</span><del>- ERRORA("samples=%d\n", GSMOPEN_P_LOG, samples);
</del><ins>+ if(tech_pvt->no_sound==0){
+ ERRORA("samples=%d\n", GSMOPEN_P_LOG, samples);
+ }
</ins><span class="cx"> goto cng;
</span><span class="cx"> }
</span><span class="cx"> //DEBUGA_GSMOPEN("samples=%d tech_pvt->read_frame.timestamp=%d\n", GSMOPEN_P_LOG, samples, tech_pvt->read_frame.timestamp);
</span><span class="lines">@@ -1231,6 +1237,7 @@
</span><span class="cx"> const char *alsa_capture_is_mono = "1";
</span><span class="cx"> const char *capture_boost = "5";
</span><span class="cx"> const char *playback_boost = "10";
</span><ins>+ const char *no_sound = "0";
</ins><span class="cx">
</span><span class="cx"> uint32_t interface_id = 0;
</span><span class="cx"> uint32_t controldevice_speed = B115200; //FIXME TODO
</span><span class="lines">@@ -1399,10 +1406,11 @@
</span><span class="cx"> capture_boost = val;
</span><span class="cx"> } else if (!strcasecmp(var, "playback_boost")) {
</span><span class="cx"> playback_boost = val;
</span><ins>+ } else if (!strcasecmp(var, "no_sound")) {
+ no_sound = val;
+ }
</ins><span class="cx">
</span><span class="cx">
</span><del>- }
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* BEGIN: Changes here */
</span><span class="lines">@@ -1478,6 +1486,10 @@
</span><span class="cx"> ERRORA("interface param 'playback_boost' MUST be a number, now playback_boost='%s'\n", GSMOPEN_P_LOG, playback_boost);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+ if (!switch_is_number(no_sound)) {
+ ERRORA("interface param 'no_sound' MUST be a number, now no_sound='%s'\n", GSMOPEN_P_LOG, no_sound);
+ continue;
+ }
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (interface_id && interface_id < GSMOPEN_MAX_INTERFACES) {
</span><span class="lines">@@ -1567,6 +1579,7 @@
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].alsa_capture_is_mono = atoi(alsa_capture_is_mono);
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].capture_boost = atoi(capture_boost);
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].playback_boost = atoi(playback_boost);
</span><ins>+ globals.GSMOPEN_INTERFACES[interface_id].no_sound = atoi(no_sound);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1608,16 +1621,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (alsa_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
- ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
- return SWITCH_STATUS_FALSE;
</del><ins>+ if(globals.GSMOPEN_INTERFACES[interface_id].no_sound==0){
+ if (alsa_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
+ ERRORA("alsa_init failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
</ins><span class="cx">
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- if (alsa_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
- ERRORA("alsa_shutdown failed\n", GSMOPEN_P_LOG);
- return SWITCH_STATUS_FALSE;
</del><ins>+ if (alsa_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
+ ERRORA("alsa_shutdown failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
</ins><span class="cx">
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> //gsmopen_store_boost((char *)"5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost); //FIXME
</span><span class="cx"> //gsmopen_store_boost((char *)"10", &globals.GSMOPEN_INTERFACES[interface_id].playback_boost); //FIXME
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>