Switch back to building dbus-cxx from master, as multiple return was …

…added in dbus-cxx/dbus-cxx#101
silverchris · Aug 22, 2022 · 2ab5417 · 2ab5417
1 parent f8508f9
commit 2ab5417
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/dbusxx-xml2cpp b/dbusxx-xml2cpp
diff --git a/include/Platforms/Mazda/Managers/GPSManager.hpp b/include/Platforms/Mazda/Managers/GPSManager.hpp
@@ -20,6 +20,7 @@ class GPSManager: public IGPSManager{
 
 
  private:
+  using gpsData = std::tuple<int32_t, uint64_t, double, double, int32_t, double, double, double, double>;
   asio::basic_waitable_timer<std::chrono::steady_clock> timer;
   std::shared_ptr<com_jci_lds_data_objectProxy> gpsclient;
   std::shared_ptr<com_jci_lds_control_objectProxy> gpscontrol;

diff --git a/src/Platforms/Mazda/Managers/GPSManager.cpp b/src/Platforms/Mazda/Managers/GPSManager.cpp
@@ -9,9 +9,7 @@ void GPSManager::update_position(const asio::error_code &error) {
 
   aasdk::proto::data::GPSLocation loc;
   try {
-    std::tuple<int32_t, uint64_t, double, double, int32_t, double, double, double, double>
-        data = gpsclient->getcom_jci_lds_dataInterface()->GetPosition();
-
+    gpsData data = gpsclient->getcom_jci_lds_dataInterface()->GetPosition().m_data;
     //timestamp 0 means "invalid" and positionAccuracy 0 means "no lock"
     if (std::get<1>(data) == 0 || std::get<0>(data) == 0) {
       std::time_t now = time(nullptr);

diff --git a/src/Platforms/Mazda/Managers/VideoManager.cpp b/src/Platforms/Mazda/Managers/VideoManager.cpp
@@ -55,7 +55,7 @@ void VideoManager::start() {
   displayModeConnection = bucpsa->getcom_jci_bucpsaInterface()->signal_DisplayMode()->connect(sigc::mem_fun(*this,
                                                                                                             &VideoManager::DisplayMode));
 
-  std::tuple<unsigned int, int> display_mode = bucpsa->getcom_jci_bucpsaInterface()->GetDisplayMode();
+  std::tuple<unsigned int, int> display_mode = bucpsa->getcom_jci_bucpsaInterface()->GetDisplayMode().m_data;
 
   currentDisplayMode = (bool) std::get<0>(display_mode);
 }