diff options
Diffstat (limited to 'src/ui/MxcMediaProxy.h')
-rw-r--r-- | src/ui/MxcMediaProxy.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/ui/MxcMediaProxy.h b/src/ui/MxcMediaProxy.h index 48de5a4f..7b7947e9 100644 --- a/src/ui/MxcMediaProxy.h +++ b/src/ui/MxcMediaProxy.h @@ -4,9 +4,9 @@ #pragma once -#include <QAbstractVideoSurface> +#include <QVideoSink> #include <QBuffer> -#include <QMediaContent> +#include <QUrl> #include <QMediaPlayer> #include <QObject> #include <QPointer> @@ -23,8 +23,6 @@ class MxcMediaProxy : public QMediaPlayer Q_OBJECT Q_PROPERTY(TimelineModel *roomm READ room WRITE setRoom NOTIFY roomChanged REQUIRED) Q_PROPERTY(QString eventId READ eventId WRITE setEventId NOTIFY eventIdChanged) - Q_PROPERTY(QAbstractVideoSurface *videoSurface READ getVideoSurface WRITE setVideoSurface NOTIFY - videoSurfaceChanged) Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged) Q_PROPERTY(int orientation READ orientation NOTIFY orientationChanged) @@ -44,16 +42,13 @@ public: room_ = room; emit roomChanged(); } - void setVideoSurface(QAbstractVideoSurface *surface); - QAbstractVideoSurface *getVideoSurface(); - int orientation() const; signals: void roomChanged(); void eventIdChanged(); void loadedChanged(); - void newBuffer(QMediaContent, QIODevice *buf); + void newBuffer(QUrl, QIODevice *buf); void orientationChanged(); void videoSurfaceChanged(); @@ -66,5 +61,5 @@ private: QString eventId_; QString filename_; QBuffer buffer; - QAbstractVideoSurface *m_surface = nullptr; + QObject *m_surface = nullptr; }; |