StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2580'

Browse Source
This commit is contained in:
tux3 2015-12-04 12:01:25 +01:00
commit ef5cb2689c
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget/form/settings/avform.cpp
View File

@ -63,7 +63,12 @@ AVForm::AVForm() :
connect(bodyUI->videoModescomboBox, qcbxIndexChangedInt, this, &AVForm::onVideoModesIndexChanged);
connect(bodyUI->filterAudio, &QCheckBox::toggled, this, &AVForm::onFilterAudioToggled);
connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=](){getAudioInDevices(); getAudioOutDevices();});
connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=]()
{
getAudioInDevices();
getAudioOutDevices();
getVideoDevices();
});
connect(bodyUI->playbackSlider, &QSlider::valueChanged, this, &AVForm::onPlaybackValueChanged);
connect(bodyUI->microphoneSlider, &QSlider::valueChanged, this, &AVForm::onMicrophoneValueChanged);
bodyUI->playbackSlider->setValue(Settings::getInstance().getOutVolume());

18
src/widget/form/settings/avsettings.ui
View File

@ -30,8 +30,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>824</width>
<height>489</height>
<width>830</width>
<height>495</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
@ -88,13 +88,6 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="rescanButton">
<property name="text">
<string>Rescan audio devices</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="playbackMax">
<property name="text">
@ -223,6 +216,13 @@ which may lead to problems with video calls.</string>
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="rescanButton">
<property name="text">
<string>Rescan devices</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>