diff --git a/daemon b/daemon index 2771304c7065de05cd78712c76f81cb643824e10..95832cfc9d5f4bd09a7f3e3e7d26d8227b1fa3f2 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 2771304c7065de05cd78712c76f81cb643824e10 +Subproject commit 95832cfc9d5f4bd09a7f3e3e7d26d8227b1fa3f2 diff --git a/src/app/settingsview/components/AudioSettingsPage.qml b/src/app/settingsview/components/AudioSettingsPage.qml index 2483cfecffb95ada90e38aab6d51ef1f3f4a079c..e78551e1b609c67657d281d08c6f7fb555e882d5 100644 --- a/src/app/settingsview/components/AudioSettingsPage.qml +++ b/src/app/settingsview/components/AudioSettingsPage.qml @@ -25,7 +25,7 @@ import "../../commoncomponents" SettingsPageBase { id: root - property int itemWidth: 188 + property int itemWidth: 250 title: JamiStrings.audio flickableContent: ColumnLayout { @@ -45,16 +45,34 @@ SettingsPageBase { target: UtilsAdapter function onChangeLanguage() { - inputAudioModel.reset(); - outputAudioModel.reset(); - ringtoneAudioModel.reset(); + rootLayout.resetDeviceModels(); + rootLayout.resetDeviceIndices(); } } - function populateAudioSettings() { + function resetDeviceModels() { + inputAudioModel.reset(); + outputAudioModel.reset(); + ringtoneAudioModel.reset(); + } + + function resetDeviceIndices() { inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex(); outputComboBoxSetting.modelIndex = outputComboBoxSetting.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) { audioManagerComboBoxSetting.modelIndex = audioManagerComboBoxSetting.comboModel.getCurrentSettingIndex(); }