Browse Source

Merge pull request #5255 from dogmaphobic/videoStreaming

Exclude method when not building with video streaming support.
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
commit
6e980ad9c4
  1. 7
      src/VideoStreaming/VideoReceiver.cc

7
src/VideoStreaming/VideoReceiver.cc

@ -27,6 +27,8 @@ @@ -27,6 +27,8 @@
QGC_LOGGING_CATEGORY(VideoReceiverLog, "VideoReceiverLog")
#if defined(QGC_GST_STREAMING)
static const char* kVideoExtensions[] =
{
"mkv",
@ -43,6 +45,9 @@ static const char* kVideoMuxes[] = @@ -43,6 +45,9 @@ static const char* kVideoMuxes[] =
#define NUM_MUXES (sizeof(kVideoMuxes) / sizeof(char*))
#endif
VideoReceiver::VideoReceiver(QObject* parent)
: QObject(parent)
#if defined(QGC_GST_STREAMING)
@ -461,6 +466,7 @@ gboolean VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer dat @@ -461,6 +466,7 @@ gboolean VideoReceiver::_onBusMessage(GstBus* bus, GstMessage* msg, gpointer dat
}
#endif
#if defined(QGC_GST_STREAMING)
void VideoReceiver::_cleanupOldVideos()
{
QString savePath = qgcApp()->toolbox()->settingsManager()->videoSettings()->videoSavePath()->rawValue().toString();
@ -493,6 +499,7 @@ void VideoReceiver::_cleanupOldVideos() @@ -493,6 +499,7 @@ void VideoReceiver::_cleanupOldVideos()
}
}
}
#endif
// When we finish our pipeline will look like this:
//

Loading…
Cancel
Save