Merge pull request #8267 from tcanabrava/move_video_manager

Move VideoManager class from FligthDisplay to VideoStreaming

qgroundcontrol.pro

@@ -568,7 +568,6 @@ HEADERS += \
     src/Camera/QGCCameraManager.h \
     src/CmdLineOptParser.h \
     src/FirmwarePlugin/PX4/px4_custom_mode.h \
-    src/FlightDisplay/VideoManager.h \
     src/FlightMap/Widgets/ValuesWidgetController.h \
     src/FollowMe/FollowMe.h \
     src/Joystick/Joystick.h \
@@ -775,7 +774,6 @@ SOURCES += \
     src/Camera/QGCCameraIO.cc \
     src/Camera/QGCCameraManager.cc \
     src/CmdLineOptParser.cc \
-    src/FlightDisplay/VideoManager.cc \
     src/FlightMap/Widgets/ValuesWidgetController.cc \
     src/FollowMe/FollowMe.cc \
     src/Joystick/Joystick.cc \
@@ -1317,11 +1315,13 @@ HEADERS += \
     src/VideoStreaming/VideoReceiver.h \
     src/VideoStreaming/VideoStreaming.h \
     src/VideoStreaming/SubtitleWriter.h \
+    src/VideoStreaming/VideoManager.h
 
 SOURCES += \
     src/VideoStreaming/VideoReceiver.cc \
     src/VideoStreaming/VideoStreaming.cc \
     src/VideoStreaming/SubtitleWriter.cc \
+    src/VideoStreaming/VideoManager.cc
 
 contains (CONFIG, DISABLE_VIDEOSTREAMING) {
     message("Skipping support for video streaming (manual override from command line)")

src/CMakeLists.txt

@@ -157,7 +157,6 @@ target_link_libraries(qgc
 		comm
 		FactSystem
 		FirmwarePlugin
-		FlightDisplay
 		FlightMap
 		FollowMe
 		Geo

src/FlightDisplay/CMakeLists.txt

@@ -1,13 +1,4 @@
 
-add_library(FlightDisplay
-	VideoManager.cc
-)
-
-target_link_libraries(FlightDisplay
-	PRIVATE
-		qgc
-)
-
 add_custom_target(FligthDisplayQml
 SOURCES
 	FlightDisplayView.qml       
@@ -28,5 +19,3 @@ SOURCES
 	PreFlightSoundCheck.qml
 	VirtualJoystick.qml
 )
-
-target_include_directories(FlightDisplay PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

src/VideoStreaming/CMakeLists.txt

@@ -13,6 +13,8 @@ add_library(VideoStreaming
     VideoReceiver.h
     VideoStreaming.cc
     VideoStreaming.h
+    VideoManager.cc
+    VideoManager.h
 )
 
 target_link_libraries(VideoStreaming