<!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][16136] </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=16136">16136</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-04 11:50:36 -0600 (Mon, 04 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Parse xml from pa devlist and set the values on UI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneprefdialogcpp">freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneprefdialogh">freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhoneprefdialogui">freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.cpp (16135 => 16136)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.cpp 2010-01-04 17:46:55 UTC (rev 16135)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.cpp 2010-01-04 17:50:36 UTC (rev 16136)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+#include <QtGui>
</ins><span class="cx"> #include "prefdialog.h"
</span><span class="cx"> #include "ui_prefdialog.h"
</span><span class="cx">
</span><span class="lines">@@ -6,6 +7,7 @@
</span><span class="cx"> ui(new Ui::PrefDialog)
</span><span class="cx"> {
</span><span class="cx"> ui->setupUi(this);
</span><ins>+ getPaDevlist();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PrefDialog::~PrefDialog()
</span><span class="lines">@@ -13,6 +15,110 @@
</span><span class="cx"> delete ui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefDialog::getPaDevlist()
+{
+ QString result;
+ int errorLine, errorColumn;
+ QString errorMsg;
+
+ if (g_FSHost.sendCmd("pa", "devlist xml", &result) != SWITCH_STATUS_SUCCESS)
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error querying audio devices."),
+ QMessageBox::Ok);
+ return;
+ }
+
+ if (!_xmlPaDevList.setContent(result, &errorMsg, &errorLine, &errorColumn))
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist.\n%1 (Line:%2, Col:%3).").arg(errorMsg,
+ errorLine,
+ errorColumn),
+ QMessageBox::Ok);
+ return;
+ }
+ QDomElement root = _xmlPaDevList.documentElement();
+ if (root.tagName() != "xml")
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist. Root tag is not <xml>."),
+ QMessageBox::Ok);
+ return;
+ }
+ QDomElement devices = root.firstChildElement("devices");
+ if (devices.isNull())
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist. There is no <devices> tag."),
+ QMessageBox::Ok);
+ return;
+ }
+
+ QDomElement child = devices.firstChildElement();
+ if (child.isNull())
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist. There is no <device> tag."),
+ QMessageBox::Ok);
+ return;
+ }
+
+ while (!child.isNull())
+ {
+ if (child.tagName() == "device")
+ {
+ QString id, name, inputs, outputs;
+ id = child.attribute("id","-1");
+ name = child.attribute("name","Null");
+ inputs = child.attribute("inputs","0");
+ outputs = child.attribute("outputs","0");
+ if (inputs.toInt() != 0)
+ ui->PaIndevCombo->addItem(name,inputs.toInt());
+ if (outputs.toInt() != 0)
+ {
+ ui->PaOutdevCombo->addItem(name,inputs.toInt());
+ ui->PaRingdevCombo->addItem(name,inputs.toInt());
+ }
+ }
+ child = child.nextSiblingElement();
+ }
+
+ QDomElement bindings = root.firstChildElement("bindings");
+ if (bindings.isNull())
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist. There is no <bindings> tag."),
+ QMessageBox::Ok);
+ return;
+ }
+
+ child = devices.firstChildElement();
+ if (child.isNull())
+ {
+ QMessageBox::critical(this, tr("PortAudio error" ),
+ tr("Error parsing output xml from pa devlist. There are no bindings."),
+ QMessageBox::Ok);
+ return;
+ }
+
+ while (!child.isNull())
+ {
+ QString id;
+ id = child.attribute("device","-1");
+
+ if (child.tagName() == "ring")
+ ui->PaRingdevCombo->setCurrentIndex(id.toInt());
+ else if (child.tagName() == "input")
+ ui->PaIndevCombo->setCurrentIndex(id.toInt());
+ else if (child.tagName() == "ring")
+ ui->PaOutdevCombo->setCurrentIndex(id.toInt());
+
+ child = child.nextSiblingElement();
+ }
+
+}
+
</ins><span class="cx"> void PrefDialog::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QDialog::changeEvent(e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneprefdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.h (16135 => 16136)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.h 2010-01-04 17:46:55 UTC (rev 16135)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.h 2010-01-04 17:50:36 UTC (rev 16136)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> #define PREFDIALOG_H
</span><span class="cx">
</span><span class="cx"> #include <QDialog>
</span><ins>+#include <QDomDocument>
+#include <fshost.h>
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class PrefDialog;
</span><span class="lines">@@ -17,7 +19,9 @@
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void getPaDevlist(void);
</ins><span class="cx"> Ui::PrefDialog *ui;
</span><ins>+ QDomDocument _xmlPaDevList;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // PREFDIALOG_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhoneprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui (16135 => 16136)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui 2010-01-04 17:46:55 UTC (rev 16135)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui 2010-01-04 17:50:36 UTC (rev 16136)
</span><span class="lines">@@ -180,7 +180,7 @@
</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="comboBox_3"/>
</del><ins>+ <widget class="QComboBox" name="PaIndevCombo"/>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_8">
</span><span class="lines">@@ -190,7 +190,7 @@
</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="comboBox_4"/>
</del><ins>+ <widget class="QComboBox" name="PaOutdevCombo"/>
</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">@@ -200,7 +200,7 @@
</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="comboBox_5"/>
</del><ins>+ <widget class="QComboBox" name="PaRingdevCombo"/>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>