Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.cpp (16135 => 16136)
--- 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)
@@ -1,3 +1,4 @@
+#include <QtGui>
#include "prefdialog.h"
#include "ui_prefdialog.h"
@@ -6,6 +7,7 @@
ui(new Ui::PrefDialog)
{
ui->setupUi(this);
+ getPaDevlist();
}
PrefDialog::~PrefDialog()
@@ -13,6 +15,110 @@
delete ui;
}
+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();
+ }
+
+}
+
void PrefDialog::changeEvent(QEvent *e)
{
QDialog::changeEvent(e);
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.h (16135 => 16136)
--- 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)
@@ -2,6 +2,8 @@
#define PREFDIALOG_H
#include <QDialog>
+#include <QDomDocument>
+#include <fshost.h>
namespace Ui {
class PrefDialog;
@@ -17,7 +19,9 @@
void changeEvent(QEvent *e);
private:
+ void getPaDevlist(void);
Ui::PrefDialog *ui;
+ QDomDocument _xmlPaDevList;
};
#endif // PREFDIALOG_H
Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/prefdialog.ui (16135 => 16136)
--- 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)
@@ -180,7 +180,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="comboBox_3"/>
+ <widget class="QComboBox" name="PaIndevCombo"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
@@ -190,7 +190,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QComboBox" name="comboBox_4"/>
+ <widget class="QComboBox" name="PaOutdevCombo"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
@@ -200,7 +200,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="QComboBox" name="comboBox_5"/>
+ <widget class="QComboBox" name="PaRingdevCombo"/>
</item>
</layout>
</widget>