lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-09 11:33:21 +02:00
Code Activity

audiosettings: select correct audio manager

Browse source 
Else, on GNU/Linux it will select "alsa" in the UI.
Also AVSettingsPage is unused.

Change-Id: I5744b2c8dc02b65d97e6ea2bf8dcec477ae0042c
This commit is contained in:
Sébastien Blin 2023-04-07 15:09:40 -04:00
parent 1e59b83025
commit 6c0bb455c7
3 changed files with 2 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/settingsview/SettingsView.qml
View file

@ -78,12 +78,6 @@ ListSelectionView {
property int selectedMenu: index
onSelectedMenuChanged: {
if (selectedMenu === SettingsView.Media) {
avSettings.populateAVSettings()
}
}
rightPaneItem: StackView {
id: settingsView
objectName: "settingsView"

3
src/app/settingsview/components/AudioSettingsPage.qml
View file

@ -182,6 +182,8 @@ SettingsPageBase {
widthOfComboBox: itemWidth
role: "ID_UTF8"
Component.onCompleted: currentAccountEnableColumnLayout.populateAudioSettings()
onActivated: {
AvAdapter.stopAudioMeter()
var selectedAudioManager = comboModel.data(
@ -193,4 +195,3 @@ SettingsPageBase {
}
}
}

68
src/app/settingsview/components/AvSettingPage.qml
View file

@ -1,68 +0,0 @@
/*
* Copyright (C) 2019-2023 Savoir-faire Linux Inc.
* Author: Yang Wang <yang.wang@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick
import QtQuick.Layouts
import net.jami.Models 1.1
import net.jami.Adapters 1.1
import net.jami.Constants 1.1
import "../../commoncomponents"
Rectangle {
id: root
property int preferredColumnWidth: Math.min(root.width / 2 - 50, 275)
property int contentWidth: avSettingsColumnLayout.width
property int preferredHeight: avSettingsColumnLayout.implicitHeight
function populateAVSettings() {
audioSettings.populateAudioSettings()
}
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: avSettingsColumnLayout
anchors.horizontalCenter: root.horizontalCenter
width: Math.min(JamiTheme.maximumWidthSettingsView, root.width)
AudioSettings {
id: audioSettings
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
itemWidth: preferredColumnWidth
}
VideoSettings {
id: videoSettings
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
itemWidth: preferredColumnWidth
}
}
}