Browse Source

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.
QGC4.4
Tomaz Canabrava 6 years ago
parent
commit
3f130f2c3c
  1. 4
      qgroundcontrol.pro
  2. 0
      src/VideoStreaming/VideoManager.cc
  3. 0
      src/VideoStreaming/VideoManager.h

4
qgroundcontrol.pro

@ -564,7 +564,6 @@ HEADERS += \ @@ -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 += \ @@ -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 += \ @@ -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)")

0
src/FlightDisplay/VideoManager.cc → src/VideoStreaming/VideoManager.cc

0
src/FlightDisplay/VideoManager.h → src/VideoStreaming/VideoManager.h

Loading…
Cancel
Save