VideoManager: Fix QtMultimedia Define

mavlink · Dec 21, 2024 · c45f87c · c45f87c
1 parent fd9e451
commit c45f87c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/src/Settings/CMakeLists.txt b/src/Settings/CMakeLists.txt
@@ -54,6 +54,7 @@ target_link_libraries(Settings
         GStreamerReceiver
         QGC
         QmlControls
+        QtMultimediaReceiver
         Vehicle
         VideoManager
         VideoReceiver

diff --git a/src/Settings/VideoSettings.cc b/src/Settings/VideoSettings.cc
@@ -66,9 +66,7 @@ DECLARE_SETTINGGROUP(Video, "Video")
 
     _nameToMetaDataMap[videoSourceName]->setEnumInfo(videoSourceCookedList, videoSourceList);
 
-#ifdef QGC_GST_STREAMING
     _setForceVideoDecodeList();
-#endif
 
     // Set default value for videoSource
     _setDefaults();
@@ -250,9 +248,9 @@ void VideoSettings::_configChanged(QVariant)
     emit streamConfiguredChanged(streamConfigured());
 }
 
-#ifdef QGC_GST_STREAMING
 void VideoSettings::_setForceVideoDecodeList()
 {
+#ifdef QGC_GST_STREAMING
     const QVariantList removeForceVideoDecodeList{
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
         GStreamer::VideoDecoderOptions::ForceVideoDecoderDirectX3D,
@@ -274,5 +272,5 @@ void VideoSettings::_setForceVideoDecodeList()
     for (const auto &value : removeForceVideoDecodeList) {
         _nameToMetaDataMap[forceVideoDecoderName]->removeEnumInfo(value);
     }
-}
 #endif
+}
diff --git a/src/Settings/VideoSettings.h b/src/Settings/VideoSettings.h
@@ -73,9 +73,7 @@ private slots:
 
 private:
     void _setDefaults               ();
-#ifdef QGC_GST_STREAMING
     void _setForceVideoDecodeList();
-#endif
 
 private:
     bool _noVideo = false;

diff --git a/src/VideoManager/CMakeLists.txt b/src/VideoManager/CMakeLists.txt
@@ -7,14 +7,6 @@ qt_add_library(VideoManager STATIC
     VideoManager.h
 )
 
-# option(QGC_ENABLE_VIDEOSTREAMING "Enable video streaming" ON)
-# cmake_print_variables(QGC_ENABLE_VIDEOSTREAMING)
-# if(NOT QGC_ENABLE_VIDEOSTREAMING)
-#     message(STATUS "Video streaming support disabled")
-#     return()
-# endif()
-# message(STATUS "Video streaming support enabled")
-
 add_subdirectory(VideoReceiver)
 
 target_link_libraries(VideoManager

diff --git a/src/VideoManager/VideoManager.cc b/src/VideoManager/VideoManager.cc
@@ -185,7 +185,7 @@ void VideoManager::init()
             }
         });
 
-        (void) connect(videoReceiver.receiver, &VideoReceiver::onTakeScreenshotComplete, this, [this, &videoReceiver](VideoReceiver::STATUS status) {
+        (void) connect(videoReceiver.receiver, &VideoReceiver::onTakeScreenshotComplete, this, [&videoReceiver](VideoReceiver::STATUS status) {
             if (status == VideoReceiver::STATUS_OK) {
                 qCDebug(VideoManagerLog) << "Video" << videoReceiver.index << "screenshot taken";
             } else {