From 09c041c8ac40d2d3608c7224614fde69e1e4f08b Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 28 Aug 2021 00:38:33 +0200 Subject: Use in memory media player instead of storing unencrypted files on disk --- src/timeline/TimelineModel.h | 9 +++++++++ src/timeline/TimelineViewManager.cpp | 2 ++ 2 files changed, 11 insertions(+) (limited to 'src/timeline') diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index e3ca8811..417fbb7f 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -293,6 +293,15 @@ public: crypto::Trust trustlevel() const; int roomMemberCount() const; + std::optional eventById(const QString &id) + { + auto e = events.get(id.toStdString(), ""); + if (e) + return *e; + else + return std::nullopt; + } + public slots: void setCurrentIndex(int index); int currentIndex() const { return idToIndex(currentId); } diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 97b60b0c..f42ec02f 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -35,6 +35,7 @@ #include "dialogs/ImageOverlay.h" #include "emoji/EmojiModel.h" #include "emoji/Provider.h" +#include "ui/MxcMediaProxy.h" #include "ui/NhekoCursorShape.h" #include "ui/NhekoDropArea.h" #include "ui/NhekoGlobalObject.h" @@ -176,6 +177,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par qmlRegisterType("im.nheko", 1, 0, "DelegateChooser"); qmlRegisterType("im.nheko", 1, 0, "NhekoDropArea"); qmlRegisterType("im.nheko", 1, 0, "CursorShape"); + qmlRegisterType("im.nheko", 1, 0, "MxcMedia"); qmlRegisterUncreatableType( "im.nheko", 1, 0, "DeviceVerificationFlow", "Can't create verification flow from QML!"); qmlRegisterUncreatableType( -- cgit 1.5.1