From 49e012ae02fc61954c9d73d27e0fc2f946c8c6dd Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Tue, 30 Aug 2016 03:07:44 -0400
Subject: [PATCH] Build fix for when GStreamer is not present.

---
 src/FlightDisplay/VideoManager.cc   | 15 +++++++++++----
 src/VideoStreaming/VideoReceiver.cc |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/FlightDisplay/VideoManager.cc b/src/FlightDisplay/VideoManager.cc
index 39963bafc..b8a1f7c81 100644
--- a/src/FlightDisplay/VideoManager.cc
+++ b/src/FlightDisplay/VideoManager.cc
@@ -22,7 +22,10 @@ static const char* kVideoSourceKey  = "VideoSource";
 static const char* kVideoUDPPortKey = "VideoUDPPort";
 static const char* kVideoRTSPUrlKey = "VideoRTSPUrl";
 static const char* kUDPStream       = "UDP Video Stream";
+#if defined(QGC_GST_STREAMING)
 static const char* kRTSPStream      = "RTSP Video Stream";
+#endif
+static const char* kNoVideo         = "No Video Available";
 
 QGC_LOGGING_CATEGORY(VideoManagerLog, "VideoManagerLog")
 
@@ -97,6 +100,8 @@ VideoManager::uvcEnabled()
 void
 VideoManager::setVideoSource(QString vSource)
 {
+    if(vSource == kNoVideo)
+        return;
     _videoSource = vSource;
     QSettings settings;
     settings.setValue(kVideoSourceKey, vSource);
@@ -115,7 +120,7 @@ VideoManager::setVideoSource(QString vSource)
     emit isGStreamerChanged();
     qCDebug(VideoManagerLog) << "New Video Source:" << vSource;
     /*
-     * Not working. Requires restart for now
+     * Not working. Requires restart for now. (Undef KRTSP/kUDP above when enabling this)
     if(isGStreamer())
         _updateVideo();
     */
@@ -137,7 +142,7 @@ VideoManager::setUdpPort(quint16 port)
     settings.setValue(kVideoUDPPortKey, port);
     emit udpPortChanged();
     /*
-     * Not working. Requires restart for now
+     * Not working. Requires restart for now. (Undef KRTSP/kUDP above when enabling this)
     if(_videoSource == kUDPStream)
         _updateVideo();
     */
@@ -152,7 +157,7 @@ VideoManager::setRtspURL(QString url)
     settings.setValue(kVideoRTSPUrlKey, url);
     emit rtspURLChanged();
     /*
-     * Not working. Requires restart for now
+     * Not working. Requires restart for now. (Undef KRTSP/kUDP above when enabling this)
     if(_videoSource == kRTSPStream)
         _updateVideo();
     */
@@ -174,6 +179,8 @@ VideoManager::videoSourceList()
         _videoSourceList.append(cameraInfo.description());
     }
 #endif
+    if(_videoSourceList.count() == 0)
+        _videoSourceList.append(kNoVideo);
     return _videoSourceList;
 }
 
@@ -218,8 +225,8 @@ void VideoManager::_updateVideo()
             delete _videoSurface;
         _videoSurface  = new VideoSurface;
         _videoReceiver = new VideoReceiver(this);
-        _videoReceiver->setVideoSink(_videoSurface->videoSink());
         #if defined(QGC_GST_STREAMING)
+        _videoReceiver->setVideoSink(_videoSurface->videoSink());
         if(_videoSource == kUDPStream)
             _videoReceiver->setUri(QStringLiteral("udp://0.0.0.0:%1").arg(_udpPort));
         else
diff --git a/src/VideoStreaming/VideoReceiver.cc b/src/VideoStreaming/VideoReceiver.cc
index 9613124df..520aa48b2 100644
--- a/src/VideoStreaming/VideoReceiver.cc
+++ b/src/VideoStreaming/VideoReceiver.cc
@@ -49,6 +49,7 @@ void VideoReceiver::setVideoSink(GstElement* sink)
 }
 #endif
 
+#if defined(QGC_GST_STREAMING)
 static void newPadCB(GstElement * element, GstPad* pad, gpointer data)
 {
     gchar *name;
@@ -63,6 +64,7 @@ static void newPadCB(GstElement * element, GstPad* pad, gpointer data)
         qCritical() << "newPadCB : failed to link elements\n";
     g_free(name);
 }
+#endif
 
 void VideoReceiver::start()
 {
-- 
2.22.0