lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

Revert "misc: av settings"

Browse source 
This reverts commit 218aa35e1e.

Change-Id: I78eebe04277e08776c1f299e385119c0f2e8eb35
This commit is contained in:
Sébastien Blin 2021-12-06 15:10:03 -05:00
parent 630d1b844e
commit 89060c27f2
No known key found for this signature in database
GPG key ID: C894BB01EEB2A9A9
5 changed files with 16 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mainview/components/ChatViewFooter.qml
View file

@ -89,11 +89,6 @@ Rectangle {
visible: false visible: false
} }
onVisibleChanged: {
if (!visible) {
recordBox.visible = false
}
}
EmojiPicker { EmojiPicker {
id: emojiPicker id: emojiPicker

20
src/mainview/components/RecordBox.qml
View file

@ -41,6 +41,7 @@ Rectangle {
property int duration: 0 property int duration: 0
property int state: RecordBox.States.INIT property int state: RecordBox.States.INIT
property bool isVideo: false property bool isVideo: false
property bool previewAvailable: false
property int preferredWidth: 320 property int preferredWidth: 320
property int preferredHeight: 240 property int preferredHeight: 240
property int btnSize: 40 property int btnSize: 40
@ -60,6 +61,7 @@ Rectangle {
if (isVideo) { if (isVideo) {
previewWidget.deviceId = VideoDevices.getDefaultDevice() previewWidget.deviceId = VideoDevices.getDefaultDevice()
previewWidget.rendererId = VideoDevices.startDevice(previewWidget.deviceId) previewWidget.rendererId = VideoDevices.startDevice(previewWidget.deviceId)
previewAvailable = true
} }
} }
@ -241,7 +243,7 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
visible: (isVideo && VideoDevices.listSize !== 0) visible: (isVideo && previewAvailable)
color: JamiTheme.blackColor color: JamiTheme.blackColor
radius: 5 radius: 5
@ -260,13 +262,6 @@ Rectangle {
maskSource: rectBox maskSource: rectBox
} }
} }
onVisibleChanged: {
if (visible) {
openRecorder(true)
} else
VideoDevices.stopDevice(previewWidget.deviceId)
}
} }
Label { Label {
@ -274,14 +269,11 @@ Rectangle {
width: root.width width: root.width
visible: (isVideo && VideoDevices.listSize === 0) visible: (isVideo && !previewAvailable)
text: JamiStrings.previewUnavailable text: qsTr("Preview unavailable")
font.pointSize: JamiTheme.settingsFontSize font.pointSize: 10
font.kerning: true font.kerning: true
color: JamiTheme.primaryForegroundColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
} }
Timer { Timer {

14
src/settingsview/components/AudioSettings.qml
View file

@ -30,7 +30,6 @@ ColumnLayout {
id:root id:root
property int itemWidth property int itemWidth
property int videoDevicesListSize: VideoDevices.listSize
enum Setting { enum Setting {
AUDIOINPUT, AUDIOINPUT,
@ -39,19 +38,6 @@ ColumnLayout {
AUDIOMANAGER AUDIOMANAGER
} }
onVisibleChanged: {
if (visible)
populateAudioSettings()
}
onVideoDevicesListSizeChanged: {
AvAdapter.stopAudioMeter()
var selectedAudioManager = inputComboBoxSetting.comboModel.data(
inputComboBoxSetting.comboModel.index(inputComboBoxSetting.modelIndex, 0), AudioDeviceModel.RawDeviceName)
AVModel.setInputDevice(selectedAudioManager)
AvAdapter.startAudioMeter()
}
function populateAudioSettings() { function populateAudioSettings() {
inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex() inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex()
outputComboBoxSetting.modelIndex = outputComboBoxSetting.comboModel.getCurrentIndex() outputComboBoxSetting.modelIndex = outputComboBoxSetting.comboModel.getCurrentIndex()

4
src/settingsview/components/AvSettingPage.qml
View file

@ -32,6 +32,10 @@ Rectangle {
property int contentWidth: avSettingsColumnLayout.width property int contentWidth: avSettingsColumnLayout.width
property int preferredHeight: avSettingsColumnLayout.implicitHeight property int preferredHeight: avSettingsColumnLayout.implicitHeight
function populateAVSettings() {
audioSettings.populateAudioSettings()
}
color: JamiTheme.secondaryBackgroundColor color: JamiTheme.secondaryBackgroundColor
ColumnLayout { ColumnLayout {

18
src/settingsview/components/VideoSettings.qml
View file

@ -32,12 +32,14 @@ ColumnLayout {
id: root id: root
property real aspectRatio: 0.75 property real aspectRatio: 0.75
property bool previewAvailable: false
property int itemWidth property int itemWidth
function startPreviewing(force = false) { function startPreviewing(force = false) {
if (root.visible) { if (root.visible) {
previewWidget.deviceId = VideoDevices.getDefaultDevice() previewWidget.deviceId = VideoDevices.getDefaultDevice()
previewWidget.rendererId = VideoDevices.startDevice(previewWidget.deviceId, force) previewWidget.rendererId = VideoDevices.startDevice(previewWidget.deviceId, force)
previewAvailable = true
} }
} }
@ -194,7 +196,7 @@ ColumnLayout {
onSwitchToggled: { onSwitchToggled: {
AvAdapter.setHardwareAcceleration(checked) AvAdapter.setHardwareAcceleration(checked)
startPreviewing() startPreviewing(true)
} }
} }
@ -228,18 +230,11 @@ ColumnLayout {
maskSource: rectBox maskSource: rectBox
} }
} }
onVisibleChanged: {
if (visible) {
VideoDevices.stopDevice(previewWidget.deviceId)
startPreviewing(true)
} else
VideoDevices.stopDevice(previewWidget.deviceId)
}
} }
Label { Label {
visible: VideoDevices.listSize === 0 // TODO: proper use of previewAvailable
visible: !previewAvailable
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: JamiTheme.preferredFieldHeight Layout.preferredHeight: JamiTheme.preferredFieldHeight
@ -248,7 +243,6 @@ ColumnLayout {
text: JamiStrings.previewUnavailable text: JamiStrings.previewUnavailable
font.pointSize: JamiTheme.settingsFontSize font.pointSize: JamiTheme.settingsFontSize
font.kerning: true font.kerning: true
color: JamiTheme.primaryForegroundColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter