diff --git a/src/UI/DocumentViews/VideoView.cc b/src/UI/DocumentViews/VideoView.cc index daefdbdbae7d3882c6f584f22de2f4dd66d9fb67..e24488fb9b068b09ef87cddfb8115a1dcb66ded9 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 debff27d89483fa9934fc36fe11daf9dcb14e01c..3b0639d959ed5911bff5bf88b2c3353e74b03db7 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 b8a3fa9789acfd693a55c0eb299d7914915301f6..549e7d19fb1eb2e7ca433c7a07f2cc61552881a4 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 584fb7b26f8259cac7d47611e67c7184f7ecd800..10d743c5a0432b622321ac56d1e4e53f3b02b7e6 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;