Further C++ refactoring.

gkoh · Sep 18, 2024 · a4a3d66 · a4a3d66
1 parent a1c22d5
commit a4a3d66
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/lib/furble/CameraList.cpp b/lib/furble/CameraList.cpp
@@ -13,7 +13,7 @@
 namespace Furble {
 
 std::vector<std::unique_ptr<Furble::Camera>> CameraList::m_ConnectList;
-static Preferences m_Prefs;
+Preferences CameraList::m_Prefs;
 
 /**
  * Non-volatile storage index entry.
@@ -26,19 +26,20 @@ typedef struct {
   Camera::Type type;
 } index_entry_t;
 
-static void fillSaveName(index_entry_t &entry, Camera *camera) {
+void CameraList::fillSaveEntry(CameraList::index_entry_t &entry, Camera *camera) {
   snprintf(entry.name, 16, "%08llX", (uint64_t)camera->getAddress());
+  entry.type = camera->getType();
 }
 
-static void save_index(std::vector<index_entry_t> &index) {
+void CameraList::save_index(std::vector<CameraList::index_entry_t> &index) {
   if (index.size() > 0) {
     m_Prefs.putBytes(FURBLE_PREF_INDEX, index.data(), sizeof(index[0]) * index.size());
   } else {
     m_Prefs.remove(FURBLE_PREF_INDEX);
   }
 }
 
-static std::vector<index_entry_t> load_index(void) {
+std::vector<CameraList::index_entry_t> CameraList::load_index(void) {
   std::vector<index_entry_t> index;
 
   size_t bytes = m_Prefs.getBytesLength(FURBLE_PREF_INDEX);
@@ -58,7 +59,7 @@ static std::vector<index_entry_t> load_index(void) {
   return index;
 }
 
-static void add_index(std::vector<index_entry_t> &index, index_entry_t &entry) {
+void CameraList::add_index(std::vector<CameraList::index_entry_t> &index, index_entry_t &entry) {
   bool exists = false;
   for (size_t i = 0; i < index.size(); i++) {
     ESP_LOGI(LOG_TAG, "[%d] %s : %s", i, index[i].name, entry.name);
@@ -81,8 +82,7 @@ void CameraList::save(Furble::Camera *camera) {
   std::vector<index_entry_t> index = load_index();
 
   index_entry_t entry = {0};
-  fillSaveName(entry, camera);
-  entry.type = camera->getType();
+  fillSaveEntry(entry, camera);
 
   add_index(index, entry);
 
@@ -104,7 +104,7 @@ void CameraList::remove(Furble::Camera *camera) {
   std::vector<index_entry_t> index = load_index();
 
   index_entry_t entry = {0};
-  fillSaveName(entry, camera);
+  fillSaveEntry(entry, camera);
 
   size_t i = 0;
   for (i = 0; i < index.size(); i++) {
@@ -184,10 +184,6 @@ Furble::Camera *CameraList::get(size_t n) {
   return m_ConnectList[n].get();
 }
 
-Furble::Camera *CameraList::back(void) {
-  return m_ConnectList.back().get();
-}
-
 bool CameraList::match(NimBLEAdvertisedDevice *pDevice) {
   if (Fujifilm::matches(pDevice)) {
     m_ConnectList.push_back(std::unique_ptr<Furble::Camera>(new Furble::Fujifilm(pDevice)));

diff --git a/lib/furble/CameraList.h b/lib/furble/CameraList.h
@@ -1,6 +1,7 @@
 #ifndef CAMERALIST_H
 #define CAMERALIST_H
 
+#include <Preferences.h>
 #include <memory>
 
 #include "Camera.h"
@@ -58,16 +59,23 @@ class CameraList {
    */
   static Furble::Camera *get(size_t n);
 
-  /**
-   * Retrieve last entry.
-   */
-  static Furble::Camera *back(void);
-
  private:
+  typedef struct {
+    char name[16];
+    Camera::Type type;
+  } index_entry_t;
+
+  static void fillSaveEntry(index_entry_t &entry, Camera *camera);
+  static std::vector<index_entry_t> load_index(void);
+  static void save_index(std::vector<index_entry_t> &index);
+  static void add_index(std::vector<index_entry_t> &index, index_entry_t &entry);
+
   /**
    * List of connectable devices.
    */
   static std::vector<std::unique_ptr<Furble::Camera>> m_ConnectList;
+
+  static Preferences m_Prefs;
 };
 }  // namespace Furble
 

diff --git a/lib/furble/MobileDevice.h b/lib/furble/MobileDevice.h
@@ -26,7 +26,7 @@ class MobileDevice: public Camera {
   void updateGeoData(const gps_t &gps, const timesync_t &timesync) override;
   void disconnect(void) override;
 
-  bool isConnected(void);
+  bool isConnected(void) override;
 
  private:
   typedef struct _mobile_device_t {