summary refs log tree commit diff
path: root/resources/qml/delegates
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-06-02 00:43:38 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-06-08 22:32:07 +0200
commite85a1d4aeb464f155cf026d33cab120f07724e70 (patch)
tree0ed576de75efe52914f1e3d30bb27db950dc91ca /resources/qml/delegates
parentMake Nheko compile on Qt6 (diff)
downloadnheko-e85a1d4aeb464f155cf026d33cab120f07724e70.tar.xz
First runnable qt6 Nheko
Diffstat (limited to 'resources/qml/delegates')
-rw-r--r--resources/qml/delegates/PlayableMediaMessage.qml22
1 files changed, 10 insertions, 12 deletions
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml

index 741369d2..1131856f 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -4,11 +4,11 @@ import "../" import "../ui/media" -import QtMultimedia 5.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import im.nheko 1.0 +import QtMultimedia +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import im.nheko Item { id: content @@ -36,12 +36,12 @@ Item { id: mxcmedia // TODO: Show error in overlay or so? - onError: console.log(error) roomm: room - // desiredVolume is a float from 0.0 -> 1.0, MediaPlayer volume is an int from 0 to 100 - // this value automatically gets clamped for us between these two values. - volume: mediaControls.desiredVolume * 100 - muted: mediaControls.muted + audioOutput: AudioOutput { + muted: mediaControls.muted + volume: mediaControls.desiredVolume + } + videoOutput: videoOutput } Rectangle { @@ -68,8 +68,6 @@ Item { clip: true anchors.fill: parent fillMode: VideoOutput.PreserveAspectFit - source: mxcmedia - flushMode: VideoOutput.FirstFrame orientation: mxcmedia.orientation }