Diff
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/FSPhone.pro (16140 => 16141)
--- 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)
@@ -8,7 +8,6 @@
QT += xml
TARGET = fsphone
macx:TARGET = FSPhone
-
TEMPLATE = app
INCLUDEPATH = ../../../src/include \
../../../libs/apr/include \
@@ -36,3 +35,6 @@
FORMS += mainwindow.ui \
prefdialog.ui
RESOURCES += resources.qrc
+OTHER_FILES += conf/portaudio.conf.xml \
+ conf/event_socket.conf.xml \
+ conf/freeswitch.xml
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/conf/freeswitch.xml (16140 => 16141)
--- 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)
@@ -97,38 +97,9 @@
<load module="mod_sndfile"/>
<load module="mod_tone_stream"/>
<load module="mod_local_stream"/>
- <load module="mod_event_socket"/>
</modules>
</configuration>
- <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>
-
<configuration name="post_load_modules.conf" description="Modules">
<modules>
</modules>
Added: freeswitch/trunk/contrib/jmesquita/FSPhone/conf/portaudio.conf.xml (0 => 16141)
--- 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)
@@ -0,0 +1,17 @@
+<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>
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui (16140 => 16141)
--- 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)
@@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>450</width>
+ <width>477</width>
<height>356</height>
</rect>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -165,42 +165,122 @@
</layout>
</widget>
<widget class="QWidget" name="page_2">
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Devices</string>
</property>
+ <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>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
- <widget class="QLabel" name="label_7">
+ <widget class="QLabel" name="label_10">
<property name="text">
- <string>indev</string>
+ <string>ring-file</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="PaIndevCombo"/>
+ <widget class="QLineEdit" name="lineEdit_2">
+ <property name="text">
+ <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
+ </property>
+ </widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="label_8">
+ <widget class="QLabel" name="label_12">
<property name="text">
- <string>outdev</string>
+ <string>ring-interval</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QComboBox" name="PaOutdevCombo"/>
+ <widget class="QSpinBox" name="spinBox_4"/>
</item>
<item row="2" column="0">
- <widget class="QLabel" name="label_9">
+ <widget class="QLabel" name="label_11">
<property name="text">
- <string>rindgev</string>
+ <string>hold-file</string>
</property>
</widget>
</item>
<item row="2" column="1">
- <widget class="QComboBox" name="PaRingdevCombo"/>
+ <widget class="QLineEdit" name="lineEdit_3"/>
</item>
</layout>
</widget>
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/resources.qrc (16140 => 16141)
--- 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)
@@ -8,5 +8,6 @@
<file alias="freeswitch.xml">conf/freeswitch.xml</file>
<file alias="example.xml">conf/accounts/example.xml</file>
<file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
+ <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
</qresource>
</RCC>