Implement GLVideoItem stub for no-gstreamer builds

qgroundcontrol.pro

@@ -331,13 +331,6 @@ contains (DEFINES, QGC_DISABLE_PAIRING) {
     DEFINES += QGC_ENABLE_PAIRING
 }
 
-
-#
-# Add qmlglsink (libs/gst-plugins-good/ext/qt)
-#
-
-include(qmlglsink.pri)
-
 #
 # External library configuration
 #

src/VideoStreaming/GLVideoItemStub.cc

@@ -0,0 +1,16 @@
+#include "GLVideoItemStub.h"
+
+GLVideoItemStub::GLVideoItemStub()
+{
+//  setFlag(QQuickItem::ItemHasContents, true);
+}
+
+GLVideoItemStub::~GLVideoItemStub()
+{
+}
+
+//QSGNode*
+//GLVideoItemStub::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData)
+//{
+//    return oldNode;
+//}

src/VideoStreaming/GLVideoItemStub.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <QtQuick/QQuickItem>
+
+class GLVideoItemStub : public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    GLVideoItemStub();
+    ~GLVideoItemStub();
+
+protected:
+//    QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData);
+
+private:
+
+};

src/VideoStreaming/VideoStreaming.cc

@@ -25,6 +25,8 @@
 #if defined(__ios__)
 #include "gst_ios_init.h"
 #endif
+#else
+#include "GLVideoItemStub.h"
 #endif
 
 #include "VideoStreaming.h"
@@ -183,9 +185,10 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
         qCritical() << "unable to find qmlglsink - you need to build it yourself and add to GST_PLUGIN_PATH";
     }
 #else
-    Q_UNUSED(argc);
+    qmlRegisterType<GLVideoItemStub> ("org.freedesktop.gstreamer.GLVideoItem", 1, 0, "GstGLVideoItem");
-    Q_UNUSED(argv);
+    Q_UNUSED(argc)
-    Q_UNUSED(logpath);
+    Q_UNUSED(argv)
-    Q_UNUSED(debuglevel);
+    Q_UNUSED(logpath)
+    Q_UNUSED(debuglevel)
 #endif
 }

src/VideoStreaming/VideoStreaming.h

@@ -17,5 +17,3 @@
 #pragma once
 
 extern void initializeVideoStreaming    (int &argc, char *argv[], char* filename, char* debuglevel);
-
-

src/VideoStreaming/VideoStreaming.pri

@@ -126,6 +126,7 @@ VideoEnabled {
             $$PWD/iOS
     }
 
+    include($$PWD/../../qmlglsink.pri)
 } else {
     LinuxBuild|MacBuild|iOSBuild|WindowsBuild|AndroidBuild {
         message("Skipping support for video streaming (GStreamer libraries not installed)")
@@ -133,5 +134,10 @@ VideoEnabled {
     } else {
         message("Skipping support for video streaming (Unsupported platform)")
     }
-}
 
+    SOURCES += \
+        $$PWD/GLVideoItemStub.cc
+
+    HEADERS += \
+        $$PWD/GLVideoItemStub.h
+}