d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 12:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1365 from Nheko-Reborn/video_improvements

Browse source 
Video player improvements
This commit is contained in:
DeepBlueV7.X 2023-02-14 18:25:23 +01:00 committed by GitHub
commit 2a28b3a343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/delegates/PlayableMediaMessage.qml
View file

@ -59,7 +59,7 @@ Item {
Image { Image {
anchors.fill: parent anchors.fill: parent
source: thumbnailUrl ? thumbnailUrl.replace("mxc://", "image://MxcImage/") + "?scale" : "" source: thumbnailUrl ? thumbnailUrl.replace("mxc://", "image://MxcImage/") + "?scale" : "image://colorimage/:/icons/icons/ui/video-file.svg?" + Nheko.colors.windowText
asynchronous: true asynchronous: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit

7
src/ui/MxcMediaProxy.cpp
View file

@ -21,10 +21,12 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#endif #endif
#include "ChatPage.h"
#include "EventAccessors.h" #include "EventAccessors.h"
#include "Logging.h" #include "Logging.h"
#include "MatrixClient.h" #include "MatrixClient.h"
#include "timeline/TimelineModel.h" #include "timeline/TimelineModel.h"
#include "timeline/TimelineViewManager.h"
MxcMediaProxy::MxcMediaProxy(QObject *parent) MxcMediaProxy::MxcMediaProxy(QObject *parent)
: QMediaPlayer(parent) : QMediaPlayer(parent)
@ -47,6 +49,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
if (t == QMediaMetaData::Orientation) if (t == QMediaMetaData::Orientation)
emit orientationChanged(); emit orientationChanged();
}); });
connect(ChatPage::instance()->timelineManager()->rooms(),
&RoomlistModel::currentRoomChanged,
this,
&MxcMediaProxy::pause);
} }
void void
MxcMediaProxy::setVideoSurface(QAbstractVideoSurface *surface) MxcMediaProxy::setVideoSurface(QAbstractVideoSurface *surface)