From 7c60c85a121a8173e1a1e6c98a8efbb139499b09 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Thu, 30 Aug 2018 21:01:31 +1000
Subject: [PATCH] Rover: use camera singleton to get camera rather than
 callback

---
 APMrover2/GCS_Mavlink.cpp | 9 ---------
 APMrover2/GCS_Mavlink.h   | 1 -
 2 files changed, 10 deletions(-)

diff --git a/APMrover2/GCS_Mavlink.cpp b/APMrover2/GCS_Mavlink.cpp
index 6e5f7c6bdb..c1dda8fa45 100644
--- a/APMrover2/GCS_Mavlink.cpp
+++ b/APMrover2/GCS_Mavlink.cpp
@@ -1268,15 +1268,6 @@ bool GCS_MAVLINK_Rover::accept_packet(const mavlink_status_t &status, mavlink_me
     return (msg.sysid == rover.g.sysid_my_gcs);
 }
 
-AP_Camera *GCS_MAVLINK_Rover::get_camera() const
-{
-#if CAMERA == ENABLED
-    return &rover.camera;
-#else
-    return nullptr;
-#endif
-}
-
 AP_AdvancedFailsafe *GCS_MAVLINK_Rover::get_advanced_failsafe() const
 {
 #if ADVANCED_FAILSAFE == ENABLED
diff --git a/APMrover2/GCS_Mavlink.h b/APMrover2/GCS_Mavlink.h
index f3c2be5950..925f5428ce 100644
--- a/APMrover2/GCS_Mavlink.h
+++ b/APMrover2/GCS_Mavlink.h
@@ -16,7 +16,6 @@ protected:
 
     AP_Mission *get_mission() override;
     AP_Rally *get_rally() const override;
-    AP_Camera *get_camera() const override;
     AP_AdvancedFailsafe *get_advanced_failsafe() const override;
     AP_VisualOdom *get_visual_odom() const override;