Merge pull request #1365 from Nheko-Reborn/video_improvements

Video player improvements

1 files changed, 7 insertions, 0 deletions

diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp

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