From 753be1142f8a5a24f24a2430d2051950fafe2993 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Thu, 30 Aug 2018 21:02:16 +1000
Subject: [PATCH] Sub: use camera singleton to get camera rather than callback

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

diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp
index 9c3ee39c14..b672e512e8 100644
--- a/ArduSub/GCS_Mavlink.cpp
+++ b/ArduSub/GCS_Mavlink.cpp
@@ -1259,15 +1259,6 @@ AP_Mission *GCS_MAVLINK_Sub::get_mission()
     return &sub.mission;
 }
 
-AP_Camera *GCS_MAVLINK_Sub::get_camera() const
-{
-#if CAMERA == ENABLED
-    return &sub.camera;
-#else
-    return nullptr;
-#endif
-}
-
 AP_Rally *GCS_MAVLINK_Sub::get_rally() const
 {
 #if AC_RALLY == ENABLED
diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_Mavlink.h
index 29408be973..53d79d99f7 100644
--- a/ArduSub/GCS_Mavlink.h
+++ b/ArduSub/GCS_Mavlink.h
@@ -14,7 +14,6 @@ protected:
 
     AP_Mission *get_mission() override;
     AP_Rally *get_rally() const override;
-    AP_Camera *get_camera() const override;
 
     MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override;