<!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][16168] </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=16168">16168</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-05 21:45:00 -0600 (Tue, 05 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>A couple of more changes to the portaudio configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommprefdialogui">freeswitch/trunk/fscomm/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommprefportaudiocpp">freeswitch/trunk/fscomm/prefportaudio.cpp</a></li>
<li><a href="#freeswitchtrunkfscommprefportaudioh">freeswitch/trunk/fscomm/prefportaudio.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefdialog.ui (16167 => 16168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefdialog.ui 2010-01-06 03:04:04 UTC (rev 16167)
+++ freeswitch/trunk/fscomm/prefdialog.ui 2010-01-06 03:45:00 UTC (rev 16168)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>661</width>
</del><ins>+ <width>711</width>
</ins><span class="cx"> <height>437</height>
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="lines">@@ -197,7 +197,27 @@
</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>+ <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>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_9">
</span><span class="lines">@@ -207,7 +227,27 @@
</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>+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QComboBox" name="PaRingdevCombo"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="PaRingdevTestBtn">
+ <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>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="lines">@@ -217,7 +257,7 @@
</span><span class="cx"> <property name="title">
</span><span class="cx"> <string>Files</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QGridLayout" name="gridLayout">
</del><ins>+ <layout class="QFormLayout" name="formLayout_5">
</ins><span class="cx"> <item row="0" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_10">
</span><span class="cx"> <property name="text">
</span><span class="lines">@@ -226,11 +266,22 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="0" column="1">
</span><del>- <widget class="QLineEdit" name="PaRingFileEdit">
- <property name="text">
- <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
- </property>
- </widget>
</del><ins>+ <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>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_12">
</span><span class="lines">@@ -240,7 +291,11 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="1">
</span><del>- <widget class="QSpinBox" name="PaRingIntervalSpin"/>
</del><ins>+ <widget class="QSpinBox" name="PaRingIntervalSpin">
+ <property name="value">
+ <number>5</number>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_11">
</span><span class="lines">@@ -250,7 +305,22 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="2" column="1">
</span><del>- <widget class="QLineEdit" name="PaHoldFileEdit"/>
</del><ins>+ <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>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefportaudiocpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefportaudio.cpp (16167 => 16168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefportaudio.cpp 2010-01-06 03:04:04 UTC (rev 16167)
+++ freeswitch/trunk/fscomm/prefportaudio.cpp 2010-01-06 03:45:00 UTC (rev 16168)
</span><span class="lines">@@ -7,8 +7,57 @@
</span><span class="cx"> _ui(ui)
</span><span class="cx"> {
</span><span class="cx"> _settings = new QSettings();
</span><ins>+ connect(_ui->PaRingFileBtn, SIGNAL(clicked()), this, SLOT(ringFileChoose()));
+ connect(_ui->PaHoldFileBtn, SIGNAL(clicked()), this, SLOT(holdFileChoose()));
+ connect(_ui->PaOutdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(outdevChangeDev(int)));
+ connect(_ui->PaRingdevCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(ringdevChangeDev(int)));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefPortaudio::ringdevChangeDev(int dev)
+{
+ QString result;
+ if (g_FSHost.sendCmd("pa", QString("ringdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev to #%d on mod_portaudio!\n", dev);
+ QMessageBox::critical(0, tr("Unable to change device."),
+ tr("There was an error changing the ringdev.\nPlease report this bug."),
+ QMessageBox::Ok);
+
+ }
+}
+
+void PrefPortaudio::outdevChangeDev(int dev)
+{
+ QString result;
+ if (g_FSHost.sendCmd("pa", QString("outdev #%1").arg(dev).toAscii().constData(), &result) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting outdev to #%d on mod_portaudio!\n", dev);
+ QMessageBox::critical(0, tr("Unable to change device."),
+ tr("There was an error changing the outdev.\nPlease report this bug."),
+ QMessageBox::Ok);
+ }
+}
+
+void PrefPortaudio::holdFileChoose()
+{
+ QString fileName = QFileDialog::getOpenFileName(0,
+ tr("Select file"),
+ QDir::homePath(),
+ NULL);
+ if (!fileName.isNull())
+ _ui->PaHoldFileEdit->setText(fileName);
+}
+
+void PrefPortaudio::ringFileChoose()
+{
+ QString fileName = QFileDialog::getOpenFileName(0,
+ tr("Select file"),
+ QDir::homePath(),
+ NULL);
+ if (!fileName.isNull())
+ _ui->PaRingFileEdit->setText(fileName);
+}
+
</ins><span class="cx"> void PrefPortaudio::writeConfig()
</span><span class="cx"> {
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf");
</span><span class="lines">@@ -79,33 +128,11 @@
</span><span class="cx">
</span><span class="cx"> if (noutdev!= outdev)
</span><span class="cx"> {
</span><del>- if (g_FSHost.sendCmd("pa", QString("outdev #%1").arg(noutdev).toAscii().constData(), &result) == SWITCH_STATUS_SUCCESS)
- {
- _settings->setValue("outdev", noutdev);
- }
- else
- {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting outdev from #%d to #%d on mod_portaudio!\n",
- outdev, noutdev);
- QMessageBox::critical(0, tr("Unable to save settings"),
- tr("There was an error changing the outdev.\nPlease report this bug."),
- QMessageBox::Ok);
- }
</del><ins>+ _settings->setValue("outdev", noutdev);
</ins><span class="cx"> }
</span><span class="cx"> if (nringdev != ringdev)
</span><span class="cx"> {
</span><del>- if (g_FSHost.sendCmd("pa", QString("ringdev #%1").arg(nringdev).toAscii().constData(), &result) == SWITCH_STATUS_SUCCESS)
- {
- _settings->setValue("ringdev", nringdev);
- }
- else
- {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error setting ringdev from #%d to #%d on mod_portaudio!\n",
- nringdev, nringdev);
- QMessageBox::critical(0, tr("Unable to save settings"),
- tr("There was an error changing the ringdev.\nPlease report this bug."),
- QMessageBox::Ok);
- }
</del><ins>+ _settings->setValue("ringdev", nringdev);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefportaudioh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefportaudio.h (16167 => 16168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefportaudio.h 2010-01-06 03:04:04 UTC (rev 16167)
+++ freeswitch/trunk/fscomm/prefportaudio.h 2010-01-06 03:45:00 UTC (rev 16168)
</span><span class="lines">@@ -15,6 +15,12 @@
</span><span class="cx"> void writeConfig();
</span><span class="cx"> void readConfig();
</span><span class="cx">
</span><ins>+private slots:
+ void ringFileChoose();
+ void holdFileChoose();
+ void outdevChangeDev(int);
+ void ringdevChangeDev(int);
+
</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>