Commit 3f3bfafa authored by Gus Grubba's avatar Gus Grubba

Build fix for when there is no video streaming support.

parent 0920b979
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
static const char* kVideoSourceKey = "VideoSource"; static const char* kVideoSourceKey = "VideoSource";
static const char* kVideoUDPPortKey = "VideoUDPPort"; static const char* kVideoUDPPortKey = "VideoUDPPort";
static const char* kVideoRTSPUrlKey = "VideoRTSPUrl"; static const char* kVideoRTSPUrlKey = "VideoRTSPUrl";
static const char* kUDPStream = "UDP Video Stream";
#if defined(QGC_GST_STREAMING) #if defined(QGC_GST_STREAMING)
static const char* kUDPStream = "UDP Video Stream";
static const char* kRTSPStream = "RTSP Video Stream"; static const char* kRTSPStream = "RTSP Video Stream";
#endif #endif
static const char* kNoVideo = "No Video Available"; static const char* kNoVideo = "No Video Available";
...@@ -42,8 +42,9 @@ VideoManager::VideoManager(QGCApplication* app) ...@@ -42,8 +42,9 @@ VideoManager::VideoManager(QGCApplication* app)
, _init(false) , _init(false)
{ {
//-- Get saved settings //-- Get saved settings
#if defined(QGC_GST_STREAMING)
QSettings settings; QSettings settings;
#if defined(NO_UDP_VIDEO) && defined(QGC_GST_STREAMING) #if defined(NO_UDP_VIDEO)
setVideoSource(settings.value(kVideoSourceKey, kRTSPStream).toString()); setVideoSource(settings.value(kVideoSourceKey, kRTSPStream).toString());
#else #else
setVideoSource(settings.value(kVideoSourceKey, kUDPStream).toString()); setVideoSource(settings.value(kVideoSourceKey, kUDPStream).toString());
...@@ -61,6 +62,7 @@ VideoManager::VideoManager(QGCApplication* app) ...@@ -61,6 +62,7 @@ VideoManager::VideoManager(QGCApplication* app)
setUdpPort(settings.value(kVideoUDPPortKey, 5600).toUInt()); setUdpPort(settings.value(kVideoUDPPortKey, 5600).toUInt());
setRtspURL(settings.value(kVideoRTSPUrlKey, "rtsp://192.168.42.1:554/live").toString()); //-- Example RTSP URL setRtspURL(settings.value(kVideoRTSPUrlKey, "rtsp://192.168.42.1:554/live").toString()); //-- Example RTSP URL
} }
#endif
_init = true; _init = true;
#if defined(QGC_GST_STREAMING) #if defined(QGC_GST_STREAMING)
_updateVideo(); _updateVideo();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment