<!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][17259] </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=17259">17259</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-04-08 21:15:29 -0500 (Thu, 08 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lets test preprocessors</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowh">freeswitch/trunk/fscomm/mainwindow.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogcpp">freeswitch/trunk/fscomm/preferences/prefdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogh">freeswitch/trunk/fscomm/preferences/prefdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogui">freeswitch/trunk/fscomm/preferences/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefportaudiocpp">freeswitch/trunk/fscomm/preferences/prefportaudio.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefportaudioh">freeswitch/trunk/fscomm/preferences/prefportaudio.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -179,10 +179,26 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::applyPreprocessors(QStringList cmds)
+{
+ if (g_FSHost.getCurrentActiveCall().isNull()) return;
+ QString uuid = g_FSHost.getCurrentActiveCall().data()->getUuid();
+ foreach(QString cmd, cmds)
+ {
+ switch_stream_handle_t stream = { 0 };
+ SWITCH_STANDARD_STREAM(stream);
+ switch_api_execute("uuid_preprocess", QString("%1 %2").arg(uuid, cmd).toAscii().data(), NULL, &stream);
+ switch_safe_free(stream.data);
+ }
+}
+
</ins><span class="cx"> void MainWindow::prefTriggered()
</span><span class="cx"> {
</span><span class="cx"> if (!preferences)
</span><ins>+ {
</ins><span class="cx"> preferences = new PrefDialog();
</span><ins>+ connect(preferences, SIGNAL(preprocessorsApplied(QStringList)), this, SLOT(applyPreprocessors(QStringList)));
+ }
</ins><span class="cx">
</span><span class="cx"> preferences->raise();
</span><span class="cx"> preferences->show();
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> void updateCallTimers();
</span><span class="cx"> void debugConsoleTriggered();
</span><span class="cx"> void debugEventsTriggered();
</span><ins>+ void applyPreprocessors(QStringList);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.cpp (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx">
</span><span class="cx"> _pref_accounts = new PrefAccounts(ui);
</span><span class="cx"> _mod_portaudio = new PrefPortaudio(ui, this);
</span><ins>+ connect(_mod_portaudio, SIGNAL(preprocessorsApplied(QStringList)), this, SIGNAL(preprocessorsApplied(QStringList)));
</ins><span class="cx"> _mod_sofia = new PrefSofia(ui, this);
</span><span class="cx"> readConfig();
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.h (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> private slots:
</span><span class="cx"> void writeConfig();
</span><span class="cx">
</span><ins>+signals:
+ void preprocessorsApplied(QStringList);
+
</ins><span class="cx"> private:
</span><span class="cx"> void readConfig();
</span><span class="cx"> QSettings *_settings;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -6,1006 +6,1158 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>839</width>
- <height>613</height>
</del><ins>+ <width>803</width>
+ <height>667</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>Preferences</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QListWidget" name="listSections">
- <property name="minimumSize">
- <size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>120</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="dragDropMode">
- <enum>QAbstractItemView::NoDragDrop</enum>
- </property>
- <property name="iconSize">
- <size>
- <width>96</width>
- <height>84</height>
- </size>
- </property>
- <property name="movement">
- <enum>QListView::Static</enum>
- </property>
- <property name="flow">
- <enum>QListView::LeftToRight</enum>
- </property>
- <property name="isWrapping" stdset="0">
- <bool>true</bool>
- </property>
- <property name="spacing">
- <number>12</number>
- </property>
- <property name="viewMode">
- <enum>QListView::IconMode</enum>
- </property>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
</ins><span class="cx"> <item>
</span><del>- <property name="text">
- <string>General</string>
- </property>
- <property name="icon">
- <iconset resource="../resources.qrc">
- <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Accounts</string>
- </property>
- <property name="icon">
- <iconset resource="../resources.qrc">
- <normaloff>:/images/pref_accounts.jpg</normaloff>:/images/pref_accounts.jpg</iconset>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Sofia</string>
- </property>
- <property name="icon">
- <iconset resource="../resources.qrc">
- <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
- </property>
- </item>
- <item>
- <property name="text">
- <string>PortAudio</string>
- </property>
- <property name="icon">
- <iconset resource="../resources.qrc">
- <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QStackedWidget" name="stackedWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="generalPage">
- <layout class="QVBoxLayout" name="verticalLayout_3">
</del><ins>+ <widget class="QListWidget" name="listSections">
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>120</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="dragDropMode">
+ <enum>QAbstractItemView::NoDragDrop</enum>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>96</width>
+ <height>84</height>
+ </size>
+ </property>
+ <property name="movement">
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::LeftToRight</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>true</bool>
+ </property>
+ <property name="spacing">
+ <number>12</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
</ins><span class="cx"> <item>
</span><del>- <widget class="QGroupBox" name="groupBox_5">
- <property name="title">
- <string>User Information</string>
- </property>
- <layout class="QFormLayout" name="formLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>CallerID Name:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="PaCallerIdNameEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_14">
- <property name="text">
- <string>CallerID Number:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="PaCallerIdNumEdit"/>
- </item>
- </layout>
- </widget>
</del><ins>+ <property name="text">
+ <string>General</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
+ </property>
</ins><span class="cx"> </item>
</span><del>- </layout>
- </widget>
- <widget class="QWidget" name="accountsPage">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
</del><span class="cx"> <item>
</span><del>- <widget class="QTableWidget" name="accountsTable">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <column>
- <property name="text">
- <string>Name</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Username</string>
- </property>
- </column>
- </widget>
</del><ins>+ <property name="text">
+ <string>Accounts</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/images/pref_accounts.jpg</normaloff>:/images/pref_accounts.jpg</iconset>
+ </property>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_7">
</del><ins>+ <property name="text">
+ <string>Sofia</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Audio</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="generalPage">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
</ins><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="sofiaGwAddBtn">
- <property name="text">
- <string>Add</string>
</del><ins>+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="title">
+ <string>User Information</string>
</ins><span class="cx"> </property>
</span><ins>+ <layout class="QFormLayout" name="formLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>CallerID Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="PaCallerIdNameEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>CallerID Number:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="PaCallerIdNumEdit"/>
+ </item>
+ </layout>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><ins>+ </layout>
+ </widget>
+ <widget class="QWidget" name="accountsPage">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
</ins><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="sofiaGwRemBtn">
- <property name="text">
- <string>Remove</string>
</del><ins>+ <widget class="QTableWidget" name="accountsTable">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
</ins><span class="cx"> </property>
</span><del>- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="sofiaGwEditBtn">
- <property name="enabled">
- <bool>true</bool>
</del><ins>+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
</ins><span class="cx"> </property>
</span><del>- <property name="text">
- <string>Edit</string>
- </property>
</del><ins>+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Username</string>
+ </property>
+ </column>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="sofiaPage">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>General</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_5">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_7">
</ins><span class="cx"> <item>
</span><del>- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Global</string>
</del><ins>+ <widget class="QPushButton" name="sofiaGwAddBtn">
+ <property name="text">
+ <string>Add</string>
</ins><span class="cx"> </property>
</span><del>- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>log-level</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="sofiaLogLevelSpin"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>auto-restart</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="sofiaAutoRestartCombo">
- <item>
- <property name="text">
- <string>true</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>false</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>debug-presence</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="sofiaDebugPresenceSpin"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_15">
- <property name="text">
- <string>rewrite-multicasted-fs-path</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="sofiaRewriteMulticastedFsPathCombo">
- <item>
- <property name="text">
- <string>false</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>true</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
</del><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <widget class="QGroupBox" name="groupBox_6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
</del><ins>+ <widget class="QPushButton" name="sofiaGwRemBtn">
+ <property name="text">
+ <string>Remove</string>
</ins><span class="cx"> </property>
</span><del>- <property name="title">
- <string>Profile</string>
- </property>
- <layout class="QFormLayout" name="formLayout_6">
- <item row="0" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>user-agent-string</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="sofiaUserAgentStringEdit">
- <property name="text">
- <string>FreeSWITCH/FSComm</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_26">
- <property name="text">
- <string>hold-music</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="sofiaHoldMusicEdit">
- <property name="text">
- <string>localstream://moh</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_16">
- <property name="text">
- <string>context</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="sofiaContextEdit">
- <property name="text">
- <string>public</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_19">
- <property name="text">
- <string>dialplan</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="sofiaDialplanEdit">
- <property name="text">
- <string>XML</string>
- </property>
- </widget>
- </item>
- </layout>
</del><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- </layout>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Network</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_4">
</del><span class="cx"> <item>
</span><del>- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Softphone Profile</string>
</del><ins>+ <widget class="QPushButton" name="sofiaGwEditBtn">
+ <property name="enabled">
+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><del>- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_18">
- <property name="text">
- <string>sip-port</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="sofiaSipPortSpin">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>65535</number>
- </property>
- <property name="value">
- <number>12345</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_22">
- <property name="text">
- <string>use-rtp-timer</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="sofiaUseRtpTimerCombo">
- <item>
- <property name="text">
- <string>true</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>false</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_24">
- <property name="text">
- <string>rtp-ip</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="sofiaRtpIpEdit">
- <property name="text">
- <string>auto</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_25">
- <property name="text">
- <string>sip-ip</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="sofiaSipIpEdit">
- <property name="text">
- <string>auto</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_27">
- <property name="text">
- <string>apply-nat-acl</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="sofiaApplyNatAclEdit">
- <property name="text">
- <string>rfc1918</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_34">
- <property name="text">
- <string>ext-rtp-ip</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="sofiaExtRtpIpEdit">
- <property name="text">
- <string>stun:stun.freeswitch.org</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label_35">
- <property name="text">
- <string>ext-sip-ip</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLineEdit" name="sofiaExtSipIpEdit">
- <property name="text">
- <string>stun:stun.freeswitch.org</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_4">
- <attribute name="title">
- <string>Codecs</string>
- </attribute>
- <layout class="QFormLayout" name="formLayout_7">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_30">
</del><span class="cx"> <property name="text">
</span><del>- <string>inbound-codec-negotiation</string>
</del><ins>+ <string>Edit</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="0" column="1">
- <widget class="QComboBox" name="sofiaInboundCodecNegotiationCombo">
- <item>
- <property name="text">
- <string>generous</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>greedy</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_42">
- <property name="text">
- <string>Codecs</string>
</del><ins>+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</ins><span class="cx"> </property>
</span><del>- </widget>
</del><ins>+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</ins><span class="cx"> </item>
</span><del>- <item row="1" column="1">
- <widget class="CodecWidget" name="sofiaProfileCodecWidget" native="true"/>
- </item>
</del><span class="cx"> </layout>
</span><del>- </widget>
- <widget class="QWidget" name="tab_3">
- <attribute name="title">
- <string>Advanced</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <widget class="QGroupBox" name="groupBox_7">
- <property name="title">
- <string>Profile</string>
- </property>
- <layout class="QFormLayout" name="formLayout_8">
- <item row="0" column="0">
- <widget class="QLabel" name="label_17">
- <property name="text">
- <string>rfc2833-pt</string>
</del><ins>+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="sofiaPage">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>General</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Global</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</ins><span class="cx"> </property>
</span><del>- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="sofiaRfc2833PtEdit">
- <property name="text">
- <string>101</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>debug</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="sofiaDebugSpin"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>sip-trace</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="sofiaSipTraceCombo">
- <item>
- <property name="text">
- <string>false</string>
- </property>
</del><ins>+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>log-level</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>true</string>
- </property>
</del><ins>+ <item row="0" column="1">
+ <widget class="QSpinBox" name="sofiaLogLevelSpin"/>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_20">
- <property name="text">
- <string>dtmf-duration</string>
</del><ins>+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>auto-restart</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="sofiaAutoRestartCombo">
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>debug-presence</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="sofiaDebugPresenceSpin"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>rewrite-multicasted-fs-path</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="sofiaRewriteMulticastedFsPathCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Profile</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>user-agent-string</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="sofiaUserAgentStringEdit">
+ <property name="text">
+ <string>FreeSWITCH/FSComm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_26">
+ <property name="text">
+ <string>hold-music</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="sofiaHoldMusicEdit">
+ <property name="text">
+ <string>localstream://moh</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>context</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="sofiaContextEdit">
+ <property name="text">
+ <string>public</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_19">
+ <property name="text">
+ <string>dialplan</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="sofiaDialplanEdit">
+ <property name="text">
+ <string>XML</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>Network</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Softphone Profile</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</ins><span class="cx"> </property>
</span><del>- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="sofiaDtmfDurationSpin">
- <property name="maximum">
- <number>1000</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_23">
- <property name="text">
- <string>rtp-timer-name</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="sofiaRtpTimerNameEdit">
- <property name="text">
- <string>soft</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_28">
- <property name="text">
- <string>manage-presence</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QComboBox" name="sofiaManagePresenceCombo">
- <item>
- <property name="text">
- <string>false</string>
- </property>
</del><ins>+ <item row="0" column="0">
+ <widget class="QLabel" name="label_18">
+ <property name="text">
+ <string>sip-port</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>true</string>
- </property>
</del><ins>+ <item row="0" column="1">
+ <widget class="QSpinBox" name="sofiaSipPortSpin">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ <property name="value">
+ <number>12345</number>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label_29">
</del><ins>+ <item row="1" column="0">
+ <widget class="QLabel" name="label_22">
+ <property name="text">
+ <string>use-rtp-timer</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="sofiaUseRtpTimerCombo">
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_24">
+ <property name="text">
+ <string>rtp-ip</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="sofiaRtpIpEdit">
+ <property name="text">
+ <string>auto</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_25">
+ <property name="text">
+ <string>sip-ip</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="sofiaSipIpEdit">
+ <property name="text">
+ <string>auto</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_27">
+ <property name="text">
+ <string>apply-nat-acl</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="sofiaApplyNatAclEdit">
+ <property name="text">
+ <string>rfc1918</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_34">
+ <property name="text">
+ <string>ext-rtp-ip</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="sofiaExtRtpIpEdit">
+ <property name="text">
+ <string>stun:stun.freeswitch.org</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_35">
+ <property name="text">
+ <string>ext-sip-ip</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLineEdit" name="sofiaExtSipIpEdit">
+ <property name="text">
+ <string>stun:stun.freeswitch.org</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_4">
+ <attribute name="title">
+ <string>Codecs</string>
+ </attribute>
+ <layout class="QFormLayout" name="formLayout_7">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_30">
+ <property name="text">
+ <string>inbound-codec-negotiation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="sofiaInboundCodecNegotiationCombo">
+ <item>
</ins><span class="cx"> <property name="text">
</span><del>- <string>max-proceeding</string>
</del><ins>+ <string>generous</string>
</ins><span class="cx"> </property>
</span><del>- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QSpinBox" name="sofiaMaxProceedingEdit">
- <property name="value">
- <number>3</number>
- </property>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QLabel" name="label_31">
</del><ins>+ </item>
+ <item>
</ins><span class="cx"> <property name="text">
</span><del>- <string>nonce-ttl</string>
</del><ins>+ <string>greedy</string>
</ins><span class="cx"> </property>
</span><del>- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QSpinBox" name="sofiaNonceTtlSpin">
- <property name="value">
- <number>60</number>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QLabel" name="label_36">
- <property name="text">
- <string>rtp-timeout-sec</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QSpinBox" name="sofiaRtpTimeoutSecSpin">
- <property name="maximum">
- <number>1000</number>
- </property>
- <property name="value">
- <number>300</number>
- </property>
- </widget>
- </item>
- <item row="9" column="0">
- <widget class="QLabel" name="label_37">
- <property name="text">
- <string>rtp-hold-timeout-sec</string>
- </property>
- </widget>
- </item>
- <item row="9" column="1">
- <widget class="QSpinBox" name="sofiaRtpHoldTimeoutSecSpin">
- <property name="maximum">
- <number>5000</number>
- </property>
- <property name="value">
- <number>1800</number>
- </property>
- </widget>
- </item>
- <item row="10" column="0">
- <widget class="QLabel" name="label_32">
- <property name="text">
- <string>auth-calls</string>
- </property>
- </widget>
- </item>
- <item row="10" column="1">
- <widget class="QComboBox" name="sofiaAuthCallsCombo">
- <item>
- <property name="text">
- <string>false</string>
- </property>
</del><ins>+ </item>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_42">
+ <property name="text">
+ <string>Codecs</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="CodecWidget" name="sofiaProfileCodecWidget" native="true"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>Advanced</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="title">
+ <string>Profile</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_8">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_17">
+ <property name="text">
+ <string>rfc2833-pt</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>true</string>
- </property>
</del><ins>+ <item row="0" column="1">
+ <widget class="QLineEdit" name="sofiaRfc2833PtEdit">
+ <property name="text">
+ <string>101</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item row="11" column="0">
- <widget class="QLabel" name="label_33">
- <property name="text">
- <string>auth-all-packets</string>
- </property>
- </widget>
- </item>
- <item row="11" column="1">
- <widget class="QComboBox" name="sofiaAuthAllPacketsCombo">
- <item>
- <property name="text">
- <string>false</string>
- </property>
</del><ins>+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>debug</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>true</string>
- </property>
</del><ins>+ <item row="1" column="1">
+ <widget class="QSpinBox" name="sofiaDebugSpin"/>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item row="12" column="0">
- <widget class="QLabel" name="label_38">
- <property name="text">
- <string>disable-register</string>
- </property>
- </widget>
- </item>
- <item row="12" column="1">
- <widget class="QComboBox" name="sofiaDisableRegisterCombo">
- <item>
- <property name="text">
- <string>true</string>
- </property>
</del><ins>+ <item row="2" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>sip-trace</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>false</string>
- </property>
</del><ins>+ <item row="2" column="1">
+ <widget class="QComboBox" name="sofiaSipTraceCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item row="13" column="0">
- <widget class="QLabel" name="label_39">
- <property name="text">
- <string>challenge-realm</string>
- </property>
- </widget>
- </item>
- <item row="13" column="1">
- <widget class="QComboBox" name="sofiaChallengeRealmCombo">
- <item>
- <property name="text">
- <string>auto_from</string>
- </property>
</del><ins>+ <item row="3" column="0">
+ <widget class="QLabel" name="label_20">
+ <property name="text">
+ <string>dtmf-duration</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <property name="text">
- <string>auto_to</string>
- </property>
</del><ins>+ <item row="3" column="1">
+ <widget class="QSpinBox" name="sofiaDtmfDurationSpin">
+ <property name="maximum">
+ <number>1000</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="portaudioPage">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QGroupBox" name="groupBox_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Devices</string>
- </property>
- <layout class="QFormLayout" name="formLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>indev</string>
- </property>
</del><ins>+ <item row="4" column="0">
+ <widget class="QLabel" name="label_23">
+ <property name="text">
+ <string>rtp-timer-name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="sofiaRtpTimerNameEdit">
+ <property name="text">
+ <string>soft</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_28">
+ <property name="text">
+ <string>manage-presence</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="sofiaManagePresenceCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_29">
+ <property name="text">
+ <string>max-proceeding</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QSpinBox" name="sofiaMaxProceedingEdit">
+ <property name="value">
+ <number>3</number>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="label_31">
+ <property name="text">
+ <string>nonce-ttl</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QSpinBox" name="sofiaNonceTtlSpin">
+ <property name="value">
+ <number>60</number>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="label_36">
+ <property name="text">
+ <string>rtp-timeout-sec</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QSpinBox" name="sofiaRtpTimeoutSecSpin">
+ <property name="maximum">
+ <number>1000</number>
+ </property>
+ <property name="value">
+ <number>300</number>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="label_37">
+ <property name="text">
+ <string>rtp-hold-timeout-sec</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QSpinBox" name="sofiaRtpHoldTimeoutSecSpin">
+ <property name="maximum">
+ <number>5000</number>
+ </property>
+ <property name="value">
+ <number>1800</number>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0">
+ <widget class="QLabel" name="label_32">
+ <property name="text">
+ <string>auth-calls</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QComboBox" name="sofiaAuthCallsCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLabel" name="label_33">
+ <property name="text">
+ <string>auth-all-packets</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="1">
+ <widget class="QComboBox" name="sofiaAuthAllPacketsCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QLabel" name="label_38">
+ <property name="text">
+ <string>disable-register</string>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="1">
+ <widget class="QComboBox" name="sofiaDisableRegisterCombo">
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="13" column="0">
+ <widget class="QLabel" name="label_39">
+ <property name="text">
+ <string>challenge-realm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="1">
+ <widget class="QComboBox" name="sofiaChallengeRealmCombo">
+ <item>
+ <property name="text">
+ <string>auto_from</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>auto_to</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </widget>
</span><del>- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="PaIndevCombo"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>outdev</string>
- </property>
</del><ins>+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="portaudioPage">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTabWidget" name="tabWidget_2">
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
+ <widget class="QWidget" name="tab_5">
+ <attribute name="title">
+ <string>General</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_9">
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Devices</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>indev</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="PaIndevCombo"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>outdev</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QComboBox" name="PaOutdevCombo"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaOutdevTestBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>86</width>
+ <height>27</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Test</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>rindgev</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QComboBox" name="PaRingdevCombo"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaRingdevTestBtn">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>86</width>
+ <height>27</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Test</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QPushButton" name="PaLoopTestBtn">
+ <property name="text">
+ <string>Loop Test</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaRefreshDevListBtn">
+ <property name="text">
+ <string>Refresh DevList</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_40">
+ <property name="text">
+ <string>Sample Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="PaSampleRateEdit">
+ <property name="text">
+ <string>16000</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_41">
+ <property name="text">
+ <string>Codec MS</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="PaCodecMSEdit">
+ <property name="text">
+ <string>10</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Files</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_5">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>ring-file</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLineEdit" name="PaRingFileEdit">
+ <property name="text">
+ <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaRingFileBtn">
+ <property name="text">
+ <string>Open</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_12">
+ <property name="text">
+ <string>ring-interval</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="PaRingIntervalSpin">
+ <property name="value">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>hold-file</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="PaHoldFileEdit">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaHoldFileBtn">
+ <property name="text">
+ <string>Open</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </widget>
</span><del>- </item>
- <item row="1" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QComboBox" name="PaOutdevCombo"/>
- </item>
- <item>
- <widget class="QPushButton" name="PaOutdevTestBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="maximumSize">
- <size>
- <width>86</width>
- <height>27</height>
- </size>
- </property>
- <property name="text">
- <string>Test</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>rindgev</string>
- </property>
</del><ins>+ <widget class="QWidget" name="tab_6">
+ <attribute name="title">
+ <string>Preprocessor</string>
+ </attribute>
+ <layout class="QFormLayout" name="formLayout_9">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label_21">
+ <property name="text">
+ <string>Echo canceller</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkAECRead">
+ <property name="text">
+ <string>read</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="checkAECWrite">
+ <property name="text">
+ <string>write</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_45">
+ <property name="text">
+ <string>Tail</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QSpinBox" name="spinAECTail"/>
+ </item>
+ <item row="5" column="0" colspan="2">
+ <widget class="QLabel" name="label_43">
+ <property name="text">
+ <string>Echo Suppressor</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QCheckBox" name="checkESRead">
+ <property name="text">
+ <string>read</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QCheckBox" name="checkESWrite">
+ <property name="text">
+ <string>write</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLabel" name="label_46">
+ <property name="text">
+ <string>Db</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QSpinBox" name="spinESDb"/>
+ </item>
+ <item row="10" column="0" colspan="2">
+ <widget class="QLabel" name="label_47">
+ <property name="text">
+ <string>Noise Supressor</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="1">
+ <widget class="QCheckBox" name="checkNSRead">
+ <property name="text">
+ <string>read</string>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="1">
+ <widget class="QCheckBox" name="checkNSWrite">
+ <property name="text">
+ <string>write</string>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="1">
+ <widget class="QLabel" name="label_48">
+ <property name="text">
+ <string>Db</string>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="1">
+ <widget class="QSpinBox" name="spinNSDb"/>
+ </item>
+ <item row="16" column="1">
+ <widget class="QCheckBox" name="checkAGCRead">
+ <property name="text">
+ <string>read</string>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="1">
+ <widget class="QCheckBox" name="checkAGCWrite">
+ <property name="text">
+ <string>write</string>
+ </property>
+ </widget>
+ </item>
+ <item row="18" column="1">
+ <widget class="QSpinBox" name="spinAGC"/>
+ </item>
+ <item row="15" column="0">
+ <widget class="QLabel" name="label_44">
+ <property name="text">
+ <string>AGC</string>
+ </property>
+ </widget>
+ </item>
+ <item row="19" column="1">
+ <widget class="QPushButton" name="btnApplyPreprocessor">
+ <property name="text">
+ <string>Apply</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </widget>
</span><del>- </item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QComboBox" name="PaRingdevCombo"/>
- </item>
- <item>
- <widget class="QPushButton" name="PaRingdevTestBtn">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="maximumSize">
- <size>
- <width>86</width>
- <height>27</height>
- </size>
- </property>
- <property name="text">
- <string>Test</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QPushButton" name="PaLoopTestBtn">
- <property name="text">
- <string>Loop Test</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="PaRefreshDevListBtn">
- <property name="text">
- <string>Refresh DevList</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_40">
- <property name="text">
- <string>Sample Rate</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="PaSampleRateEdit">
- <property name="text">
- <string>16000</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_41">
- <property name="text">
- <string>Codec MS</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="PaCodecMSEdit">
- <property name="text">
- <string>10</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Files</string>
- </property>
- <layout class="QFormLayout" name="formLayout_5">
- <item row="0" column="0">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>ring-file</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLineEdit" name="PaRingFileEdit">
- <property name="text">
- <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="PaRingFileBtn">
- <property name="text">
- <string>Open</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>ring-interval</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="PaRingIntervalSpin">
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_11">
- <property name="text">
- <string>hold-file</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLineEdit" name="PaHoldFileEdit">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="PaHoldFileBtn">
- <property name="text">
- <string>Open</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
</del><ins>+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><del>- <item row="1" column="1">
</del><ins>+ <item>
</ins><span class="cx"> <widget class="QDialogButtonBox" name="buttonBox">
</span><span class="cx"> <property name="orientation">
</span><span class="cx"> <enum>Qt::Horizontal</enum>
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefportaudiocpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefportaudio.cpp (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefportaudio.cpp 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/preferences/prefportaudio.cpp 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -15,8 +15,30 @@
</span><span class="cx"> connect(_ui->PaRingdevTestBtn, SIGNAL(clicked()), this, SLOT(ringdevTest()));
</span><span class="cx"> connect(_ui->PaLoopTestBtn, SIGNAL(clicked()), this, SLOT(loopTest()));
</span><span class="cx"> connect(_ui->PaRefreshDevListBtn, SIGNAL(clicked()), this, SLOT(refreshDevList()));
</span><ins>+ connect(_ui->btnApplyPreprocessor, SIGNAL(toggled(bool)), this, SLOT(applyPreprocessors(bool)));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefPortaudio::applyPreprocessors(bool state)
+{
+ QStringList cmds;
+ if (!state)
+ {
+ cmds.append("stop");
+ }
+ else
+ {
+ if (_ui->checkAECRead->isChecked()) cmds.append(QString("recho_cancel=%1").arg(_ui->spinAECTail->value()));
+ if (_ui->checkAECWrite->isChecked()) cmds.append(QString("wecho_cancel=%1").arg(_ui->spinAECTail->value()));
+ if (_ui->checkESRead->isChecked()) cmds.append(QString("recho_suppress=%1").arg(_ui->spinESDb->value()));
+ if (_ui->checkESWrite->isChecked()) cmds.append(QString("wecho_suppress=%1").arg(_ui->spinESDb->value()));
+ if (_ui->checkNSRead->isChecked()) cmds.append(QString("rnoise_suppress=%1").arg(_ui->spinNSDb->value()));
+ if (_ui->checkNSWrite->isChecked()) cmds.append(QString("wnoise_suppress=%1").arg(_ui->spinNSDb->value()));
+ if (_ui->checkAGCRead->isChecked()) cmds.append(QString("ragc=%1").arg(_ui->spinAGC->value()));
+ if (_ui->checkAGCWrite->isChecked()) cmds.append(QString("wagc=%1").arg(_ui->spinAGC->value()));
+ }
+ emit preprocessorsApplied(cmds);
+}
+
</ins><span class="cx"> void PrefPortaudio::ringdevTest()
</span><span class="cx"> {
</span><span class="cx"> QString result;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefportaudioh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefportaudio.h (17258 => 17259)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefportaudio.h 2010-04-08 21:17:13 UTC (rev 17258)
+++ freeswitch/trunk/fscomm/preferences/prefportaudio.h 2010-04-09 02:15:29 UTC (rev 17259)
</span><span class="lines">@@ -24,6 +24,11 @@
</span><span class="cx"> void ringdevTest();
</span><span class="cx"> void loopTest();
</span><span class="cx"> void refreshDevList();
</span><ins>+ void applyPreprocessors(bool);
+
+signals:
+ void preprocessorsApplied(QStringList);
+
</ins><span class="cx"> private:
</span><span class="cx"> void getPaDevlist(void);
</span><span class="cx"> QSettings *_settings;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>