<!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][16438] </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=16438">16438</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-21 13:08:51 -0600 (Thu, 21 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: beefing up gsmopen_dump API command and CUSTOM gsmopen::dump_event EVENT</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp">freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenportaudio_nogsmlib_noalsa_nocplusplusmod_gsmopenMakefile">freeswitch/branches/gmaruzz/mod_gsmopen/portaudio_nogsmlib_noalsa_nocplusplus/mod_gsmopen/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-21 18:46:40 UTC (rev 16437)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-21 19:08:51 UTC (rev 16438)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> #endif //0
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_API(gsmopen_boost_audio_function);
</span><del>-#define GSMOPEN_BOOST_AUDIO_SYNTAX "interface_name [<play|capt> <in decibels: -40 ... +40>]"
</del><ins>+#define GSMOPEN_BOOST_AUDIO_SYNTAX "interface_name [<play|capt> <in decibels: -40 ... 0 ... +40>]"
</ins><span class="cx"> SWITCH_STANDARD_API(sendsms_function);
</span><span class="cx"> #define SENDSMS_SYNTAX "gsmopen_sendsms interface_name destination_number SMS_text"
</span><span class="cx"> SWITCH_STANDARD_API(gsmopen_dump_function);
</span><span class="lines">@@ -2669,11 +2669,15 @@
</span><span class="cx"> goto end;
</span><span class="cx"> } else if ((strncmp("play", argv[1], strlen(argv[1])) == 0)) {
</span><span class="cx"> if (switch_is_number(argv[2])) {
</span><ins>+ stream->write_function(stream,"[%s] playback boost was %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].playback_boost);
</ins><span class="cx"> gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].playback_boost); //FIXME
</span><ins>+ stream->write_function(stream,"[%s] playback boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].playback_boost);
</ins><span class="cx"> }
</span><span class="cx"> }else if ((strncmp("capt", argv[1], strlen(argv[1])) == 0)) {
</span><span class="cx"> if (switch_is_number(argv[2])) {
</span><ins>+ stream->write_function(stream,"[%s] capture boost was %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].capture_boost);
</ins><span class="cx"> gsmopen_store_boost(argv[2], &globals.GSMOPEN_INTERFACES[i].capture_boost); //FIXME
</span><ins>+ stream->write_function(stream,"[%s] capture boost is now %f\n", globals.GSMOPEN_INTERFACES[i].name, globals.GSMOPEN_INTERFACES[i].capture_boost);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "ERROR, usage: %s", GSMOPEN_BOOST_AUDIO_SYNTAX);
</span><span class="lines">@@ -2937,6 +2941,7 @@
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> switch_core_session_t *session = NULL;
</span><span class="cx"> int event_sent_to_esl = 0;
</span><ins>+ char value[512];
</ins><span class="cx">
</span><span class="cx"> DEBUGA_GSMOPEN("STATUS of interface %s: \n", GSMOPEN_P_LOG, tech_pvt->name );
</span><span class="cx">
</span><span class="lines">@@ -2944,7 +2949,26 @@
</span><span class="cx"> session = switch_core_session_locate(tech_pvt->session_uuid_str);
</span><span class="cx"> }
</span><span class="cx"> if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_DUMP) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface", tech_pvt->name);
</del><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
+#ifdef GSMOPEN_ALSA
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsacname", tech_pvt->alsacname);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsapname", tech_pvt->alsapname);
+#endif// GSMOPEN_ALSA
+#ifdef GSMOPEN_PORTAUDIO
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiocindex);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiocindex", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiopindex);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiopindex", value);
+#endif// GSMOPEN_PORTAUDIO
+ snprintf(value, sizeof(value)-1, "%f", tech_pvt->playback_boost);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "playback_boost", value);
+ snprintf(value, sizeof(value)-1, "%f", tech_pvt->capture_boost);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "capture_boost", value);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialplan", tech_pvt->dialplan);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", tech_pvt->context);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "destination", tech_pvt->destination);
</ins><span class="cx"> if (session) {
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
</span><span class="cx"> if (switch_core_session_queue_event(session, &event) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -2964,7 +2988,27 @@
</span><span class="cx"> if (!event_sent_to_esl) {
</span><span class="cx">
</span><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface", tech_pvt->name);
</del><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_id", tech_pvt->id);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "controldevice_name", tech_pvt->controldevice_name);
+#ifdef GSMOPEN_ALSA
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsacname", tech_pvt->alsacname);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alsapname", tech_pvt->alsapname);
+#endif// GSMOPEN_ALSA
+#ifdef GSMOPEN_PORTAUDIO
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiocindex);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiocindex", value);
+ snprintf(value, sizeof(value)-1, "%d", tech_pvt->portaudiopindex);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "portaudiopindex", value);
+#endif// GSMOPEN_PORTAUDIO
+ snprintf(value, sizeof(value)-1, "%f", tech_pvt->playback_boost);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "playback_boost", value);
+ snprintf(value, sizeof(value)-1, "%f", tech_pvt->capture_boost);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "capture_boost", value);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialplan", tech_pvt->dialplan);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "context", tech_pvt->context);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "destination", tech_pvt->destination);
+
</ins><span class="cx"> if (session) {
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "during-call", "true");
</span><span class="cx"> } else { //no session
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenportaudio_nogsmlib_noalsa_nocplusplusmod_gsmopenMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/portaudio_nogsmlib_noalsa_nocplusplus/mod_gsmopen/Makefile (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/portaudio_nogsmlib_noalsa_nocplusplus/mod_gsmopen/Makefile 2010-01-21 18:46:40 UTC (rev 16437)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/portaudio_nogsmlib_noalsa_nocplusplus/mod_gsmopen/Makefile 2010-01-21 19:08:51 UTC (rev 16438)
</span><span class="lines">@@ -2,5 +2,5 @@
</span><span class="cx"> SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"'
</span><span class="cx"> LOCAL_CFLAGS += $(SVNDEF) -DNO_GSMLIB -DNO_ALSA -DGSMOPEN_PORTAUDIO
</span><span class="cx"> LOCAL_LDFLAGS=-lportaudio -lspeex -lspeexdsp
</span><del>-LOCAL_OBJS=gsmopen_protocol.o pablio.o pa_ringbuffer.o
</del><ins>+LOCAL_OBJS=gsmopen_protocol.o pablio.o pa_ringbuffer.o celliax_spandsp.o
</ins><span class="cx"> include ../../../../../../build/modmake.rules
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>