[vlc-commits] qt: add compositor interface

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Mar 24 09:52:50 2020 +0100| [b4c9b1129d6b3ed7034347fc74615c0e218f90d8] | committer: Pierre Lamot

qt: add compositor interface

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4c9b1129d6b3ed7034347fc74615c0e218f90d8
---

 modules/gui/qt/Makefile.am                  |  2 ++
 modules/gui/qt/maininterface/compositor.cpp | 28 ++++++++++++++++
 modules/gui/qt/maininterface/compositor.hpp | 52 +++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index c5b3dbaabe..5ea867f418 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -114,6 +114,8 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/sout/sout_widgets.hpp \
 	gui/qt/dialogs/toolbar/toolbareditor.cpp gui/qt/dialogs/toolbar/toolbareditor.hpp \
 	gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
+	gui/qt/maininterface/compositor.hpp \
+	gui/qt/maininterface/compositor.cpp \
 	gui/qt/maininterface/main_interface.cpp \
 	gui/qt/maininterface/main_interface.hpp \
 	gui/qt/maininterface/videosurface.cpp \
diff --git a/modules/gui/qt/maininterface/compositor.cpp b/modules/gui/qt/maininterface/compositor.cpp
new file mode 100644
index 0000000000..96edd2d9b7
--- /dev/null
+++ b/modules/gui/qt/maininterface/compositor.cpp
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#include "compositor.hpp"
+
+namespace vlc {
+
+Compositor* Compositor::createCompositor(intf_thread_t *p_intf)
+{
+    return nullptr;
+}
+
+}
diff --git a/modules/gui/qt/maininterface/compositor.hpp b/modules/gui/qt/maininterface/compositor.hpp
new file mode 100644
index 0000000000..aef4e11a32
--- /dev/null
+++ b/modules/gui/qt/maininterface/compositor.hpp
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef VLC_QT_COMPOSITOR
+#define VLC_QT_COMPOSITOR
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include <vlc_vout_window.h>
+
+#include <QQuickView>
+
+class MainInterface;
+
+namespace vlc {
+
+class Compositor {
+public:
+
+    virtual ~Compositor() = default;
+
+    virtual MainInterface* makeMainInterface() = 0;
+    virtual void destroyMainInterface() = 0;
+
+    virtual bool setupVoutWindow(vout_window_t *p_wnd) = 0;
+
+    //factory
+    static Compositor* createCompositor(intf_thread_t *p_intf);
+};
+
+
+}
+
+#endif /* VLC_QT_COMPOSITOR */