Skip to content
Snippets Groups Projects
Commit 47c40eb2 authored by Edric Milaret's avatar Edric Milaret Committed by Nicolas Jager
Browse files

audio: let user choose output and input 

This had been deactivated because non-working in the deamon

Change-Id: Ibd658af14277d1435cda400d23fc2078d9de3b5a
Tuleap: #32
parent 5a32fa84
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
configurationwidget.cpp
+ 29
− 0
View file @ 47c40eb2
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
#include "video/rate.h" #include "video/rate.h"
#include "video/previewmanager.h" #include "video/previewmanager.h"
#include "audio/settings.h"
#include "audio/outputdevicemodel.h"
#include "audio/inputdevicemodel.h"
#include "media/recordingmodel.h" #include "media/recordingmodel.h"
#include "accountserializationadapter.h" #include "accountserializationadapter.h"
...@@ -152,6 +156,17 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) : ...@@ -152,6 +156,17 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
ui->generalTabButton->setChecked(true); ui->generalTabButton->setChecked(true);
auto inputModel = Audio::Settings::instance().inputDeviceModel();
auto outputModel = Audio::Settings::instance().outputDeviceModel();
ui->outputComboBox->setModel(outputModel);
ui->inputComboBox->setModel(inputModel);
ui->outputComboBox->setCurrentIndex(outputModel->selectionModel()->currentIndex().row());
ui->inputComboBox->setCurrentIndex(inputModel->selectionModel()->currentIndex().row());
connect(ui->outputComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(outputIndexChanged(int)));
connect(ui->inputComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(inputIndexChanged(int)));
#ifndef ENABLE_AUTOUPDATE #ifndef ENABLE_AUTOUPDATE
ui->checkUpdateButton->hide(); ui->checkUpdateButton->hide();
ui->intervalUpdateCheckSpinBox->hide(); ui->intervalUpdateCheckSpinBox->hide();
...@@ -331,3 +346,17 @@ ConfigurationWidget::on_recordPath_clicked() ...@@ -331,3 +346,17 @@ ConfigurationWidget::on_recordPath_clicked()
ui->recordPath->setText(dir); ui->recordPath->setText(dir);
} }
} }
void
ConfigurationWidget::outputIndexChanged(int index)
{
auto outputModel = Audio::Settings::instance().outputDeviceModel();
outputModel->selectionModel()->setCurrentIndex(outputModel->index(index), QItemSelectionModel::ClearAndSelect);
}
void
ConfigurationWidget::inputIndexChanged(int index)
{
auto inputModel = Audio::Settings::instance().inputDeviceModel();
inputModel->selectionModel()->setCurrentIndex(inputModel->index(index), QItemSelectionModel::ClearAndSelect);
}
configurationwidget.h
+ 2
− 1
View file @ 47c40eb2
...@@ -63,7 +63,8 @@ private slots: ...@@ -63,7 +63,8 @@ private slots:
private slots: private slots:
void accountSelected(QItemSelection itemSel); void accountSelected(QItemSelection itemSel);
void deviceIndexChanged(int index); void deviceIndexChanged(int index);
void outputIndexChanged(int index);
void inputIndexChanged(int index);
private: private:
Ui::ConfigurationWidget *ui; Ui::ConfigurationWidget *ui;
AccountModel* accountModel_; AccountModel* accountModel_;
......
configurationwidget.ui
+ 100
− 41
View file @ 47c40eb2
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="generalPage"> <widget class="QWidget" name="generalPage">
<layout class="QHBoxLayout" name="verticalLayout_2"> <layout class="QHBoxLayout" name="verticalLayout_2">
...@@ -718,7 +718,7 @@ ...@@ -718,7 +718,7 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="videoPage"> <widget class="QWidget" name="videoPage">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,1" columnstretch="0,0"> <layout class="QGridLayout" name="gridLayout" rowstretch="0,1" columnstretch="0,0,0">
<property name="leftMargin"> <property name="leftMargin">
<number>10</number> <number>10</number>
</property> </property>
...@@ -734,6 +734,59 @@ ...@@ -734,6 +734,59 @@
<property name="spacing"> <property name="spacing">
<number>10</number> <number>10</number>
</property> </property>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="VideoWidget" name="videoView" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QLabel" name="previewUnavailable">
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Preview unavailable during call</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing"> <property name="spacing">
...@@ -814,6 +867,9 @@ ...@@ -814,6 +867,9 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
</property> </property>
<property name="formAlignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>15</number> <number>15</number>
</property> </property>
...@@ -886,60 +942,63 @@ ...@@ -886,60 +942,63 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QFormLayout" name="formLayout_2">
<item> <property name="formAlignment">
<widget class="VideoWidget" name="videoView" native="true"> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="horizontalSpacing">
<size> <number>15</number>
<width>0</width> </property>
<height>0</height> <property name="leftMargin">
</size> <number>0</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Output Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <item row="1" column="1">
<widget class="QLabel" name="previewUnavailable"> <widget class="QComboBox" name="outputComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="font"> <property name="font">
<font> <font>
<pointsize>13</pointsize> <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font> </font>
</property> </property>
<property name="styleSheet">
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text"> <property name="text">
<string>Preview unavailable during call</string> <string>Input Device</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="1">
<widget class="QComboBox" name="inputComboBox"/>
</item> </item>
<item row="0" column="1"> <item row="0" column="0">
<spacer name="horizontalSpacer"> <spacer name="verticalSpacer_6">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>20</width>
<height>20</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="accountPage"> <widget class="QWidget" name="accountPage">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1"> <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment