From 3f130f2c3c765f2aa7825d14ddbc54a95135b7af Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sat, 7 Dec 2019 16:00:05 +0000 Subject: [PATCH] Move VideoManager class from FligthDisplay to VideoStreaming Makes more sense for it to be in VideoStreamer as it takes care of managing the video streams. --- qgroundcontrol.pro | 4 ++-- src/{FlightDisplay => VideoStreaming}/VideoManager.cc | 0 src/{FlightDisplay => VideoStreaming}/VideoManager.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{FlightDisplay => VideoStreaming}/VideoManager.cc (100%) rename src/{FlightDisplay => VideoStreaming}/VideoManager.h (100%) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 831a87f940..0f799fc411 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -564,7 +564,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 \ @@ -771,7 +770,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 \ @@ -1303,11 +1301,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)") diff --git a/src/FlightDisplay/VideoManager.cc b/src/VideoStreaming/VideoManager.cc similarity index 100% rename from src/FlightDisplay/VideoManager.cc rename to src/VideoStreaming/VideoManager.cc diff --git a/src/FlightDisplay/VideoManager.h b/src/VideoStreaming/VideoManager.h similarity index 100% rename from src/FlightDisplay/VideoManager.h rename to src/VideoStreaming/VideoManager.h -- GitLab