Pass SceneStore as const ref through handlers

ebu · May 14, 2024 · ab7adb9 · ab7adb9
1 parent d216065
commit ab7adb9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/ear-production-suite-plugins/lib/include/binaural_monitoring_backend.hpp b/ear-production-suite-plugins/lib/include/binaural_monitoring_backend.hpp
@@ -68,7 +68,7 @@ class BinauralMonitoringBackend {
   bool isExporting() { return isExporting_; }
 
  private:
-  void onSceneReceived(proto::SceneStore store);
+  void onSceneReceived(const proto::SceneStore& store);
   void onConnection(communication::ConnectionId connectionId,
                     const std::string& streamEndpoint);
   void onConnectionLost();

diff --git a/ear-production-suite-plugins/lib/include/communication/monitoring_metadata_receiver.hpp b/ear-production-suite-plugins/lib/include/communication/monitoring_metadata_receiver.hpp
@@ -14,7 +14,7 @@ class SceneStore;
 namespace communication {
 class MonitoringMetadataReceiver {
  public:
-  using RequestHandler = std::function<void(proto::SceneStore)>;
+  using RequestHandler = std::function<void(const proto::SceneStore& store)>;
   MonitoringMetadataReceiver(std::shared_ptr<spdlog::logger> logger = nullptr);
   ~MonitoringMetadataReceiver();
   MonitoringMetadataReceiver(const MonitoringMetadataReceiver&) = delete;

diff --git a/ear-production-suite-plugins/lib/include/monitoring_backend.hpp b/ear-production-suite-plugins/lib/include/monitoring_backend.hpp
@@ -35,11 +35,11 @@ class MonitoringBackend {
   bool isExporting() { return isExporting_; }
 
  private:
-  void onSceneReceived(proto::SceneStore store);
+  void onSceneReceived(const proto::SceneStore& store);
   void onConnection(communication::ConnectionId connectionId,
                     const std::string& streamEndpoint);
   void onConnectionLost();
-  void updateActiveGains(proto::SceneStore store);
+  void updateActiveGains(const proto::SceneStore& store);
 
   std::shared_ptr<spdlog::logger> logger_;
   std::mutex gainsMutex_;

diff --git a/ear-production-suite-plugins/lib/include/scene_gains_calculator.hpp b/ear-production-suite-plugins/lib/include/scene_gains_calculator.hpp
@@ -27,7 +27,7 @@ struct ItemGains {
 class SceneGainsCalculator {
  public:
   SceneGainsCalculator(Layout outputLayout, int inputChannelCount);
-  bool update(proto::SceneStore store);
+  bool update(const proto::SceneStore &store);
   Eigen::MatrixXf directGains();
   Eigen::MatrixXf diffuseGains();
 

diff --git a/ear-production-suite-plugins/lib/src/binaural_monitoring_backend.cpp b/ear-production-suite-plugins/lib/src/binaural_monitoring_backend.cpp
@@ -200,7 +200,8 @@ BinauralMonitoringBackend::getLatestObjectsTypeMetadata(ConnId id) {
   return std::optional<ObjectsEarMetadataAndRouting>();
 }
 
-void BinauralMonitoringBackend::onSceneReceived(proto::SceneStore store) {
+void BinauralMonitoringBackend::onSceneReceived(
+    const proto::SceneStore& store) {
   isExporting_ = store.has_is_exporting() && store.is_exporting();
 
   size_t totalDsChannels = 0;

diff --git a/ear-production-suite-plugins/lib/src/communication/monitoring_metadata_receiver.cpp b/ear-production-suite-plugins/lib/src/communication/monitoring_metadata_receiver.cpp
@@ -65,7 +65,7 @@ void MonitoringMetadataReceiver::handleReceive(std::error_code ec,
       }
       // Called by NNG callback on thread with small stack.
       // Launch task in another thread to overcome stack limitation.
-      auto future = std::async(std::launch::async, [this, sceneStore = std::move(sceneStore)]() {
+      auto future = std::async(std::launch::async, [this, sceneStore]() {
         handler_(sceneStore);
       });
       future.get(); //blocking

diff --git a/ear-production-suite-plugins/lib/src/monitoring_backend.cpp b/ear-production-suite-plugins/lib/src/monitoring_backend.cpp
@@ -47,20 +47,20 @@ MonitoringBackend::~MonitoringBackend() {
   controlConnection_.onConnectionEstablished(nullptr);
 }
 
-void MonitoringBackend::onSceneReceived(proto::SceneStore store) {
+void MonitoringBackend::onSceneReceived(const proto::SceneStore& store) {
   isExporting_ = store.has_is_exporting() && store.is_exporting();
-  updateActiveGains(std::move(store));
+  updateActiveGains(store);
 }
 
 GainHolder MonitoringBackend::currentGains() {
   std::lock_guard<std::mutex> lock(gainsMutex_);
   return gains_;
 }
 
-void MonitoringBackend::updateActiveGains(proto::SceneStore store) {
+void MonitoringBackend::updateActiveGains(const proto::SceneStore& store) {
   {
     std::lock_guard<std::mutex> lock(gainsCalculatorMutex_);
-    gainsCalculator_.update(std::move(store));
+    gainsCalculator_.update(store);
   }
   {
     std::lock_guard<std::mutex> lock(gainsMutex_);

diff --git a/ear-production-suite-plugins/lib/src/scene_gains_calculator.cpp b/ear-production-suite-plugins/lib/src/scene_gains_calculator.cpp
@@ -51,7 +51,7 @@ SceneGainsCalculator::SceneGainsCalculator(ear::Layout outputLayout,
       totalOutputChannels{static_cast<int>(outputLayout.channels().size())},
       totalInputChannels{inputChannelCount} {}
 
-bool SceneGainsCalculator::update(proto::SceneStore store) {
+bool SceneGainsCalculator::update(const proto::SceneStore& store) {
   // First figure out what we need to process updates for
   std::vector<communication::ConnectionId> cachedIdsChecklist;
   cachedIdsChecklist.reserve(routingCache_.size());