Added InterfaceBase class for SimpleDBus

OpenBluetoothToolbox · Sep 27, 2024 · 218c38c · 218c38c
1 parent 7cb0bdd
commit 218c38c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/simpledbus/CMakeLists.txt b/simpledbus/CMakeLists.txt
@@ -33,6 +33,7 @@ endif()
 set(SIMPLEDBUS_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 set(SIMPLEDBUS_SRC
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/InterfaceBase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/RemoteInterface.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/advanced/RemoteProxy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/base/Connection.cpp

diff --git a/simpledbus/include/simpledbus/advanced/InterfaceBase.h b/simpledbus/include/simpledbus/advanced/InterfaceBase.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <simpledbus/base/Connection.h>
+
+#include <atomic>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace SimpleDBus {
+
+class InterfaceBase {
+  public:
+    InterfaceBase(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path,
+              const std::string& interface_name);
+
+    virtual ~InterfaceBase() = default;
+
+    virtual void message_handle(Message& msg) = 0;
+
+  protected:
+    std::string _path;
+    std::string _bus_name;
+    std::string _interface_name;
+    std::shared_ptr<Connection> _conn;
+};
+
+}  // namespace SimpleDBus
diff --git a/simpledbus/include/simpledbus/advanced/RemoteInterface.h b/simpledbus/include/simpledbus/advanced/RemoteInterface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <simpledbus/base/Connection.h>
+#include <simpledbus/advanced/InterfaceBase.h>
 
 #include <atomic>
 #include <map>
@@ -10,7 +10,7 @@
 
 namespace SimpleDBus {
 
-class RemoteInterface {
+class RemoteInterface : public InterfaceBase {
   public:
     RemoteInterface(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path,
               const std::string& interface_name);
@@ -42,11 +42,6 @@ class RemoteInterface {
   protected:
     std::atomic_bool _loaded{true};
 
-    std::string _path;
-    std::string _bus_name;
-    std::string _interface_name;
-    std::shared_ptr<Connection> _conn;
-
     std::recursive_mutex _property_update_mutex;
     std::map<std::string, bool> _property_valid_map;
 

diff --git a/simpledbus/src/advanced/InterfaceBase.cpp b/simpledbus/src/advanced/InterfaceBase.cpp
@@ -0,0 +1,7 @@
+#include <simpledbus/advanced/InterfaceBase.h>
+
+using namespace SimpleDBus;
+
+InterfaceBase::InterfaceBase(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path,
+                     const std::string& interface_name)
+    : _conn(conn), _bus_name(bus_name), _path(path), _interface_name(interface_name) {}
diff --git a/simpledbus/src/advanced/RemoteInterface.cpp b/simpledbus/src/advanced/RemoteInterface.cpp
@@ -5,7 +5,7 @@ using namespace SimpleDBus;
 
 RemoteInterface::RemoteInterface(std::shared_ptr<Connection> conn, const std::string& bus_name, const std::string& path,
                      const std::string& interface_name)
-    : _conn(conn), _bus_name(bus_name), _path(path), _interface_name(interface_name), _loaded(true) {}
+    : InterfaceBase(conn, bus_name, path, interface_name), _loaded(true) {}
 
 // ----- LIFE CYCLE -----