Skip to content
Snippets Groups Projects
Commit ff5f94b3 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk
Browse files

settings: update devices list when devices changed

When a new device is connected/disconnected update audio devices list in
the media settings.

This commit also bumps jami-daemon to support DevicesChanged events on
Windows.

Gitlab: #689
Gitlab: #1878
Change-Id: Ibb607939897853794fdbd09eab72f378257d458c
parent def2e19a
Branches
No related merge requests found
daemon @ 95832cfc
Subproject commit 2771304c7065de05cd78712c76f81cb643824e10 Subproject commit 95832cfc9d5f4bd09a7f3e3e7d26d8227b1fa3f2
...@@ -25,7 +25,7 @@ import "../../commoncomponents" ...@@ -25,7 +25,7 @@ import "../../commoncomponents"
SettingsPageBase { SettingsPageBase {
id: root id: root
property int itemWidth: 188 property int itemWidth: 250
title: JamiStrings.audio title: JamiStrings.audio
flickableContent: ColumnLayout { flickableContent: ColumnLayout {
...@@ -45,16 +45,34 @@ SettingsPageBase { ...@@ -45,16 +45,34 @@ SettingsPageBase {
target: UtilsAdapter target: UtilsAdapter
function onChangeLanguage() { function onChangeLanguage() {
rootLayout.resetDeviceModels();
rootLayout.resetDeviceIndices();
}
}
function resetDeviceModels() {
inputAudioModel.reset(); inputAudioModel.reset();
outputAudioModel.reset(); outputAudioModel.reset();
ringtoneAudioModel.reset(); ringtoneAudioModel.reset();
} }
}
function populateAudioSettings() { function resetDeviceIndices() {
inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex(); inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex();
outputComboBoxSetting.modelIndex = outputComboBoxSetting.comboModel.getCurrentIndex(); outputComboBoxSetting.modelIndex = outputComboBoxSetting.comboModel.getCurrentIndex();
ringtoneComboBoxSetting.modelIndex = ringtoneComboBoxSetting.comboModel.getCurrentIndex(); ringtoneComboBoxSetting.modelIndex = ringtoneComboBoxSetting.comboModel.getCurrentIndex();
}
Connections {
target: AvAdapter
function onAudioDeviceListChanged(inputs, outputs) {
rootLayout.resetDeviceModels();
rootLayout.resetDeviceIndices();
}
}
function populateAudioSettings() {
rootLayout.resetDeviceIndices();
if (audioManagerComboBoxSetting.comboModel.rowCount() > 0) { if (audioManagerComboBoxSetting.comboModel.rowCount() > 0) {
audioManagerComboBoxSetting.modelIndex = audioManagerComboBoxSetting.comboModel.getCurrentSettingIndex(); audioManagerComboBoxSetting.modelIndex = audioManagerComboBoxSetting.comboModel.getCurrentSettingIndex();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment