medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Make VideoPage work again

Browse source
This commit is contained in:
Sebastian Wolf 2021-01-06 12:58:16 +01:00
parent 9299205379
commit 7e6c871261
No known key found for this signature in database
GPG key ID: CEA9522B5F38A90A
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
qml/components/VideoPreview.qml
View file

@ -27,7 +27,7 @@ Item {
property ListItem messageListItem property ListItem messageListItem
property MessageOverlayFlickable overlayFlickable property MessageOverlayFlickable overlayFlickable
property var rawMessage: messageListItem ? messageListItem.myMessage : overlayFlickable.overlayMessage property var rawMessage: messageListItem ? messageListItem.myMessage : ( overlayFlickable ? overlayFlickable.overlayMessage : undefined )
property var videoData: ( rawMessage.content['@type'] === "messageVideo" ) ? rawMessage.content.video : ( ( rawMessage.content['@type'] === "messageAnimation" ) ? rawMessage.content.animation : rawMessage.content.video_note ) property var videoData: ( rawMessage.content['@type'] === "messageVideo" ) ? rawMessage.content.video : ( ( rawMessage.content['@type'] === "messageAnimation" ) ? rawMessage.content.animation : rawMessage.content.video_note )
property string videoUrl; property string videoUrl;
@ -89,7 +89,7 @@ Item {
videoMessageComponent.videoType = videoMessageComponent.isVideoNote ? "video" : videoData['@type']; videoMessageComponent.videoType = videoMessageComponent.isVideoNote ? "video" : videoData['@type'];
videoFileId = videoData[videoType].id; videoFileId = videoData[videoType].id;
if (rawMessage.content['@type'] === "messageAnimation") { if (typeof rawMessage !== "undefined" && rawMessage.content['@type'] === "messageAnimation") {
playButton.visible = true; playButton.visible = true;
fullscreenButton.visible = !videoMessageComponent.fullscreen; fullscreenButton.visible = !videoMessageComponent.fullscreen;
handlePlay(); handlePlay();
@ -294,21 +294,6 @@ Item {
} }
} }
Connections {
target: videoMessageComponent
onClicked: {
if (messageVideo.playbackState === MediaPlayer.PlayingState) {
enableScreensaver();
messageVideo.pause();
timeLeftItem.visible = true;
} else {
disableScreensaver();
messageVideo.play();
timeLeftTimer.start();
}
}
}
Video { Video {
id: messageVideo id: messageVideo
@ -367,7 +352,7 @@ Item {
height: parent.height height: parent.height
source: videoUrl source: videoUrl
layer.enabled: videoMessageComponent.highlighted layer.enabled: videoMessageComponent.highlighted
layer.effect: PressEffect { source: singleImage } layer.effect: PressEffect { source: messageVideo }
onStopped: { onStopped: {
enableScreensaver(); enableScreensaver();
messageVideo.visible = false; messageVideo.visible = false;
@ -376,6 +361,21 @@ Item {
videoComponentLoader.active = false; videoComponentLoader.active = false;
fullscreenItem.visible = !videoMessageComponent.fullscreen; fullscreenItem.visible = !videoMessageComponent.fullscreen;
} }
MouseArea {
anchors.fill: parent
onClicked: {
if (messageVideo.playbackState === MediaPlayer.PlayingState) {
enableScreensaver();
messageVideo.pause();
timeLeftItem.visible = true;
} else {
disableScreensaver();
messageVideo.play();
timeLeftTimer.start();
}
}
}
} }
BusyIndicator { BusyIndicator {
@ -514,7 +514,6 @@ Item {
} }
} }
} }