<!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][16141] </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=16141">16141</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-04 14:03:25 -0600 (Mon, 04 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>The saga of the configuration dialog.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneFSPhonepro">freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneconffreeswitchxml">freeswitch/trunk/contrib/jmesquita/FSPhone/conf/freeswitch.xml</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneprefdialogui">freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneresourcesqrc">freeswitch/trunk/contrib/jmesquita/FSPhone/resources.qrc</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneconfportaudioconfxml">freeswitch/trunk/contrib/jmesquita/FSPhone/conf/portaudio.conf.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneFSPhonepro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro (16140 => 16141)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro 2010-01-04 19:03:43 UTC (rev 16140)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro 2010-01-04 20:03:25 UTC (rev 16141)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx"> QT += xml
</span><span class="cx"> TARGET = fsphone
</span><span class="cx"> macx:TARGET = FSPhone
</span><del>-
</del><span class="cx"> TEMPLATE = app
</span><span class="cx"> INCLUDEPATH = ../../../src/include \
</span><span class="cx"> ../../../libs/apr/include \
</span><span class="lines">@@ -36,3 +35,6 @@
</span><span class="cx"> FORMS += mainwindow.ui \
</span><span class="cx"> prefdialog.ui
</span><span class="cx"> RESOURCES += resources.qrc
</span><ins>+OTHER_FILES += conf/portaudio.conf.xml \
+ conf/event_socket.conf.xml \
+ conf/freeswitch.xml
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/conf/freeswitch.xml (16140 => 16141)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/conf/freeswitch.xml 2010-01-04 19:03:43 UTC (rev 16140)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/conf/freeswitch.xml 2010-01-04 20:03:25 UTC (rev 16141)
</span><span class="lines">@@ -97,38 +97,9 @@
</span><span class="cx"> <load module="mod_sndfile"/>
</span><span class="cx"> <load module="mod_tone_stream"/>
</span><span class="cx"> <load module="mod_local_stream"/>
</span><del>- <load module="mod_event_socket"/>
</del><span class="cx"> </modules>
</span><span class="cx"> </configuration>
</span><span class="cx">
</span><del>- <configuration name="portaudio.conf" description="Soundcard Endpoint">
- <settings>
- <param name="indev" value=""/>
- <!-- device to use for output -->
- <param name="outdev" value=""/>
- <!--<param name="ringdev" value=""/>-->
- <param name="ring-file" value="tone_stream://%(2000,4000,440.0,480.0);loops=20"/>
- <param name="ring-interval" value="5"/>
- <param name="hold-file" value="$${hold_music}"/>
- <!--<param name="timer-name" value="soft"/>-->
- <param name="dialplan" value="XML"/>
- <param name="cid-name" value="$${outbound_caller_name}"/>
- <param name="cid-num" value="$${outbound_caller_number}"/>
- <param name="sample-rate" value="48000"/>
- <param name="codec-ms" value="10"/>
- </settings>
- </configuration>
-
- <configuration name="event_socket.conf" description="Socket Client">
- <settings>
- <param name="nat-map" value="false"/>
- <param name="listen-ip" value="127.0.0.1"/>
- <param name="listen-port" value="8021"/>
- <param name="password" value="ClueCon"/>
- <!--<param name="apply-inbound-acl" value="lan"/>-->
- </settings>
- </configuration>
-
</del><span class="cx"> <configuration name="post_load_modules.conf" description="Modules">
</span><span class="cx"> <modules>
</span><span class="cx"> </modules>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneconfportaudioconfxml"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/FSPhone/conf/portaudio.conf.xml (0 => 16141)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/conf/portaudio.conf.xml (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/conf/portaudio.conf.xml 2010-01-04 20:03:25 UTC (rev 16141)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<configuration name="portaudio.conf" description="Soundcard Endpoint">
+ <settings>
+ <param name="indev" value="${indev}"/>
+ <!-- device to use for output -->
+ <param name="outdev" value="${outdev}"/>
+ <!--<param name="ringdev" value="${ringdev}"/>-->
+ <param name="ring-file" value="${ring-file}"/>
+ <param name="ring-interval" value="${ring-interval}"/>
+ <param name="hold-file" value="$${hold_music}"/>
+ <!--<param name="timer-name" value="soft"/>-->
+ <param name="dialplan" value="XML"/>
+ <param name="cid-name" value="$${outbound_caller_name}"/>
+ <param name="cid-num" value="$${outbound_caller_number}"/>
+ <param name="sample-rate" value="48000"/>
+ <param name="codec-ms" value="10"/>
+ </settings>
+</configuration>
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui (16140 => 16141)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui 2010-01-04 19:03:43 UTC (rev 16140)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui 2010-01-04 20:03:25 UTC (rev 16141)
</span><span class="lines">@@ -6,14 +6,14 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>450</width>
</del><ins>+ <width>477</width>
</ins><span class="cx"> <height>356</height>
</span><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="QVBoxLayout" name="verticalLayout">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_3">
</ins><span class="cx"> <item>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout">
</span><span class="cx"> <item>
</span><span class="lines">@@ -165,42 +165,122 @@
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <widget class="QWidget" name="page_2">
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_3">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout">
</ins><span class="cx"> <item>
</span><span class="cx"> <widget class="QGroupBox" name="groupBox_3">
</span><span class="cx"> <property name="title">
</span><span class="cx"> <string>Devices</string>
</span><span class="cx"> </property>
</span><ins>+ <widget class="QLabel" name="label_7">
+ <property name="geometry">
+ <rect>
+ <x>72</x>
+ <y>34</y>
+ <width>34</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>indev</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="PaIndevCombo">
+ <property name="geometry">
+ <rect>
+ <x>111</x>
+ <y>32</y>
+ <width>111</width>
+ <height>26</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_8">
+ <property name="geometry">
+ <rect>
+ <x>63</x>
+ <y>64</y>
+ <width>43</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>outdev</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="PaOutdevCombo">
+ <property name="geometry">
+ <rect>
+ <x>111</x>
+ <y>62</y>
+ <width>111</width>
+ <height>26</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_9">
+ <property name="geometry">
+ <rect>
+ <x>59</x>
+ <y>94</y>
+ <width>47</width>
+ <height>17</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>rindgev</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="PaRingdevCombo">
+ <property name="geometry">
+ <rect>
+ <x>111</x>
+ <y>92</y>
+ <width>111</width>
+ <height>26</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="title">
+ <string>Files</string>
+ </property>
</ins><span class="cx"> <layout class="QFormLayout" name="formLayout_3">
</span><span class="cx"> <item row="0" column="0">
</span><del>- <widget class="QLabel" name="label_7">
</del><ins>+ <widget class="QLabel" name="label_10">
</ins><span class="cx"> <property name="text">
</span><del>- <string>indev</string>
</del><ins>+ <string>ring-file</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="0" column="1">
</span><del>- <widget class="QComboBox" name="PaIndevCombo"/>
</del><ins>+ <widget class="QLineEdit" name="lineEdit_2">
+ <property name="text">
+ <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="0">
</span><del>- <widget class="QLabel" name="label_8">
</del><ins>+ <widget class="QLabel" name="label_12">
</ins><span class="cx"> <property name="text">
</span><del>- <string>outdev</string>
</del><ins>+ <string>ring-interval</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="1">
</span><del>- <widget class="QComboBox" name="PaOutdevCombo"/>
</del><ins>+ <widget class="QSpinBox" name="spinBox_4"/>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="0">
</span><del>- <widget class="QLabel" name="label_9">
</del><ins>+ <widget class="QLabel" name="label_11">
</ins><span class="cx"> <property name="text">
</span><del>- <string>rindgev</string>
</del><ins>+ <string>hold-file</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="1">
</span><del>- <widget class="QComboBox" name="PaRingdevCombo"/>
</del><ins>+ <widget class="QLineEdit" name="lineEdit_3"/>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneresourcesqrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/resources.qrc (16140 => 16141)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/resources.qrc 2010-01-04 19:03:43 UTC (rev 16140)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/resources.qrc 2010-01-04 20:03:25 UTC (rev 16141)
</span><span class="lines">@@ -8,5 +8,6 @@
</span><span class="cx"> <file alias="freeswitch.xml">conf/freeswitch.xml</file>
</span><span class="cx"> <file alias="example.xml">conf/accounts/example.xml</file>
</span><span class="cx"> <file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
</span><ins>+ <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
</ins><span class="cx"> </qresource>
</span><span class="cx"> </RCC>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>