From fd5b97e552d84c404b090d47523fef5eb597199e Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 8 Feb 2022 19:50:09 +0100
Subject: [PATCH] FIX: Make vivy compile again
---
src/UI/DocumentViews/VideoView.cc | 9 ++++-----
src/UI/DocumentViews/VideoView.hh | 3 ++-
src/UI/DocumentViews/old/MpvContainer.cc | 2 +-
src/UI/DocumentViews/old/MpvControls.cc | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/UI/DocumentViews/VideoView.cc b/src/UI/DocumentViews/VideoView.cc
index daefdbdb..e24488fb 100644
--- a/src/UI/DocumentViews/VideoView.cc
+++ b/src/UI/DocumentViews/VideoView.cc
@@ -1,18 +1,17 @@
#include "PreCompiledHeaders.hh"
#include "UI/DocumentViews/VideoView.hh"
-#include "UI/DocumentViews/MpvContainer.hh"
-#include "UI/DocumentViews/MpvControls.hh"
+#include "old/MpvControls.hh"
using namespace Vivy;
VideoView::VideoView(QWidget *parent) noexcept
: QWidget(parent)
- , mpv(new MpvContainer(this))
+ , mpv(new MpvWidget(this))
{
auto *centralLayout = new QVBoxLayout(this);
centralLayout->addWidget(mpv, 1);
- centralLayout->addWidget(new MpvControls(mpv, this));
+ // centralLayout->addWidget(new MpvControls(mpv, this));
setLayout(centralLayout);
}
@@ -26,5 +25,5 @@ VideoView::loadFile(const QString &filename) noexcept
void
VideoView::forceStopPlayback() noexcept
{
- mpv->mpvPause();
+ mpv->stop();
}
diff --git a/src/UI/DocumentViews/VideoView.hh b/src/UI/DocumentViews/VideoView.hh
index debff27d..3b0639d9 100644
--- a/src/UI/DocumentViews/VideoView.hh
+++ b/src/UI/DocumentViews/VideoView.hh
@@ -6,6 +6,7 @@
#include "PreCompiledHeaders.hh"
#include "Lib/Utils.hh"
+#include "UI/DocumentViews/MpvWidget.hh"
namespace Vivy
{
@@ -15,7 +16,7 @@ class VideoView final : public QWidget {
Q_OBJECT
VIVY_UNMOVABLE_OBJECT(VideoView)
- MpvContainer *mpv{ nullptr };
+ MpvWidget *mpv{ nullptr };
public:
explicit VideoView(QWidget *parent) noexcept;
diff --git a/src/UI/DocumentViews/old/MpvContainer.cc b/src/UI/DocumentViews/old/MpvContainer.cc
index b8a3fa97..549e7d19 100644
--- a/src/UI/DocumentViews/old/MpvContainer.cc
+++ b/src/UI/DocumentViews/old/MpvContainer.cc
@@ -1,5 +1,5 @@
#include "PreCompiledHeaders.hh"
-#include "UI/DocumentViews/MpvContainer.hh"
+#include "MpvContainer.hh"
#include "UI/MainWindow.hh"
using namespace Vivy;
diff --git a/src/UI/DocumentViews/old/MpvControls.cc b/src/UI/DocumentViews/old/MpvControls.cc
index 584fb7b2..10d743c5 100644
--- a/src/UI/DocumentViews/old/MpvControls.cc
+++ b/src/UI/DocumentViews/old/MpvControls.cc
@@ -1,6 +1,6 @@
#include "PreCompiledHeaders.hh"
-#include "UI/DocumentViews/MpvControls.hh"
-#include "UI/DocumentViews/MpvContainer.hh"
+#include "MpvControls.hh"
+#include "MpvContainer.hh"
using namespace Vivy;
--
GitLab