<!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][17217] </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=17217">17217</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-05 17:13:13 -0500 (Mon, 05 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>added configuration of gains in openzap.conf and display through CLI</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17216 => 17217)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-05 21:49:43 UTC (rev 17216)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-05 22:13:13 UTC (rev 17217)
</span><span class="lines">@@ -2767,6 +2767,8 @@
</span><span class="cx"> "type: %s\n"
</span><span class="cx"> "state: %s\n"
</span><span class="cx"> "last_state: %s\n"
</span><ins>+ "txgain: %3.2f\n"
+ "rxgain: %3.2f\n"
</ins><span class="cx"> "cid_date: %s\n"
</span><span class="cx"> "cid_name: %s\n"
</span><span class="cx"> "cid_num: %s\n"
</span><span class="lines">@@ -2782,6 +2784,8 @@
</span><span class="cx"> ftdm_chan_type2str(span->channels[chan_id]->type),
</span><span class="cx"> ftdm_channel_state2str(span->channels[chan_id]->state),
</span><span class="cx"> ftdm_channel_state2str(span->channels[chan_id]->last_state),
</span><ins>+ span->channels[chan_id]->txgain,
+ span->channels[chan_id]->rxgain,
</ins><span class="cx"> span->channels[chan_id]->caller_data.cid_date,
</span><span class="cx"> span->channels[chan_id]->caller_data.cid_name,
</span><span class="cx"> span->channels[chan_id]->caller_data.cid_num.digits,
</span><span class="lines">@@ -2808,6 +2812,8 @@
</span><span class="cx"> " <type>%s</type>\n"
</span><span class="cx"> " <state>%s</state>\n"
</span><span class="cx"> " <last-state>%s</last-state>\n"
</span><ins>+ " <txgain>%3.2f</txgain>\n"
+ " <rxgain>%3.2f</rxgain>\n"
</ins><span class="cx"> " <cid-date>%s</cid-date>\n"
</span><span class="cx"> " <cid-name>%s</cid-name>\n"
</span><span class="cx"> " <cid-num>%s</cid-num>\n"
</span><span class="lines">@@ -2824,6 +2830,8 @@
</span><span class="cx"> ftdm_chan_type2str(span->channels[chan_id]->type),
</span><span class="cx"> ftdm_channel_state2str(span->channels[chan_id]->state),
</span><span class="cx"> ftdm_channel_state2str(span->channels[chan_id]->last_state),
</span><ins>+ span->channels[chan_id]->txgain,
+ span->channels[chan_id]->rxgain,
</ins><span class="cx"> span->channels[chan_id]->caller_data.cid_date,
</span><span class="cx"> span->channels[chan_id]->caller_data.cid_name,
</span><span class="cx"> span->channels[chan_id]->caller_data.cid_num.digits,
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17216 => 17217)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-05 21:49:43 UTC (rev 17216)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-05 22:13:13 UTC (rev 17217)
</span><span class="lines">@@ -2034,7 +2034,6 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- /* FIXME: validate user gain values */
</del><span class="cx"> case FTDM_COMMAND_SET_RX_GAIN:
</span><span class="cx"> {
</span><span class="cx"> ftdmchan->rxgain = FTDM_COMMAND_OBJ_FLOAT;
</span><span class="lines">@@ -2826,7 +2825,25 @@
</span><span class="cx"> return rval;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void ftdm_set_channels_gains(ftdm_span_t *span, int currindex, float rxgain, float txgain)
+{
+ unsigned chan_index = 0;
</ins><span class="cx">
</span><ins>+ if (!span->chan_count) {
+ return;
+ }
+
+ for (chan_index = currindex+1; chan_index <= span->chan_count; chan_index++) {
+ if (!FTDM_IS_VOICE_CHANNEL(span->channels[chan_index])) {
+ continue;
+ }
+ ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_RX_GAIN, &rxgain);
+ ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_TX_GAIN, &txgain);
+ }
+}
+
+
+
</ins><span class="cx"> static ftdm_status_t ftdm_group_add_channels(const char* name, ftdm_span_t* span, int currindex);
</span><span class="cx"> static ftdm_status_t load_config(void)
</span><span class="cx"> {
</span><span class="lines">@@ -2842,6 +2859,8 @@
</span><span class="cx"> char group_name[80] = "default";
</span><span class="cx"> ftdm_io_interface_t *fio = NULL;
</span><span class="cx"> ftdm_analog_start_type_t tmp;
</span><ins>+ float rxgain = 0.0;
+ float txgain = 0.0;
</ins><span class="cx"> ftdm_size_t len = 0;
</span><span class="cx">
</span><span class="cx"> if (!ftdm_config_open_file(&cfg, cfg_name)) {
</span><span class="lines">@@ -2949,6 +2968,7 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXO) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_FXO, name, number);
</span><ins>+ ftdm_set_channels_gains(span, currindex, rxgain, txgain);
</ins><span class="cx"> ftdm_group_add_channels(group_name, span, currindex);
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add FXO channels to an FXS trunk!\n");
</span><span class="lines">@@ -2962,6 +2982,7 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXS) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_FXS, name, number);
</span><ins>+ ftdm_set_channels_gains(span, currindex, rxgain, txgain);
</ins><span class="cx"> ftdm_group_add_channels(group_name, span, currindex);
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add FXS channels to an FXO trunk!\n");
</span><span class="lines">@@ -2975,6 +2996,7 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_EM) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_EM, name, number);
</span><ins>+ ftdm_set_channels_gains(span, currindex, rxgain, txgain);
</ins><span class="cx"> ftdm_group_add_channels(group_name, span, currindex);
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add EM channels to a non-EM trunk!\n");
</span><span class="lines">@@ -2982,6 +3004,7 @@
</span><span class="cx"> } else if (!strcasecmp(var, "b-channel")) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_B, name, number);
</span><ins>+ ftdm_set_channels_gains(span, currindex, rxgain, txgain);
</ins><span class="cx"> ftdm_group_add_channels(group_name, span, currindex);
</span><span class="cx"> } else if (!strcasecmp(var, "d-channel")) {
</span><span class="cx"> if (d) {
</span><span class="lines">@@ -3000,10 +3023,19 @@
</span><span class="cx"> } else if (!strcasecmp(var, "cas-channel")) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_CAS, name, number);
</span><ins>+ ftdm_set_channels_gains(span, currindex, rxgain, txgain);
</ins><span class="cx"> ftdm_group_add_channels(group_name, span, currindex);
</span><span class="cx"> } else if (!strcasecmp(var, "dtmf_hangup")) {
</span><span class="cx"> span->dtmf_hangup = ftdm_strdup(val);
</span><span class="cx"> span->dtmf_hangup_len = strlen(val);
</span><ins>+ } else if (!strcasecmp(var, "txgain")) {
+ if (sscanf(val, "%f", &txgain) != 1) {
+ ftdm_log(FTDM_LOG_ERROR, "invalid txgain: '%s'\n", val);
+ }
+ } else if (!strcasecmp(var, "rxgain")) {
+ if (sscanf(val, "%f", &rxgain) != 1) {
+ ftdm_log(FTDM_LOG_ERROR, "invalid rxgain: '%s'\n", val);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "group")) {
</span><span class="cx"> len = strlen(val);
</span><span class="cx"> if (len >= sizeof(group_name)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>