Skip to content
Extraits de code Groupes Projets
Vérifiée Valider fd5b97e5 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

FIX: Make vivy compile again

parent 704c8927
Branches Domi
Aucune étiquette associée trouvée
1 requête de fusion!27Draft: Fix mpv deadlock on quit main window
Pipeline #2729 réussi
#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();
}
......@@ -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;
......
#include "PreCompiledHeaders.hh"
#include "UI/DocumentViews/MpvContainer.hh"
#include "MpvContainer.hh"
#include "UI/MainWindow.hh"
using namespace Vivy;
......
#include "PreCompiledHeaders.hh"
#include "UI/DocumentViews/MpvControls.hh"
#include "UI/DocumentViews/MpvContainer.hh"
#include "MpvControls.hh"
#include "MpvContainer.hh"
using namespace Vivy;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter