Metadata changed state fixes inline with EBU PR ebu#111

marthellio · Sep 14, 2021 · a4379eb · a4379eb
1 parent e5dfd82
commit a4379eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ear-production-suite-plugins/lib/src/communication/hoa_metadata_sender.cpp b/ear-production-suite-plugins/lib/src/communication/hoa_metadata_sender.cpp
@@ -70,12 +70,14 @@ void HoaMetadataSender::sendMetadata() {
     return;
   }
   auto msg = getMessage();
+  data_.set_changed(false);
   socket_.asyncSend(
       msg, [this](std::error_code ec, const nng::Message& ignored) {
         if (!ec) {
           std::lock_guard<std::mutex> lock(timeoutMutex_);
           lastSendTimestamp_ = std::chrono::system_clock::now();
         } else {
+          data_.set_changed(true);
           EAR_LOGGER_WARN(logger_, "Metadata sending failed: {}", ec.message());
         }
       });
@@ -139,7 +141,7 @@ void HoaMetadataSender::speakerSetupIndex(int value) {
   data_.set_allocated_ds_metadata(
       proto::convertSpeakerSetupToEpsMetadata(value));
 }*/
- 
+
 
 }  // namespace communication
 }  // namespace plugin

diff --git a/ear-production-suite-plugins/plugins/scene/src/scene_frontend_connector.cpp b/ear-production-suite-plugins/plugins/scene/src/scene_frontend_connector.cpp
@@ -207,11 +207,11 @@ void JuceSceneFrontendConnector::reloadItemListCache() {
             });
         if (it == container->hoaItems.end()) {
           auto view = std::make_shared<ItemView>();
-          view->setData({item, false});
+          view->setMetadata(item);
           container->hoaItems.push_back(view);
           container->hoaList->addItem(view.get());
         } else {
-          (*it)->setData({item, false});
+          (*it)->setMetadata(item);
         }
       }
     }
@@ -338,10 +338,11 @@ void JuceSceneFrontendConnector::updateItemView(communication::ConnectionId id,
     } else if (item.has_hoa_metadata()) {
       auto it = std::find_if(container->hoaItems.begin(), container->hoaItems.end(),
                        [id](auto entry) { return id == entry->getId(); });
-      if (it != container->hoaItems.end()){(*it)->setData({item,false});
+      if (it != container->hoaItems.end()){
+        (*it)->setMetadata(item);
       } else {
         auto view = std::make_shared<ItemView>();
-        view->setData({item, false});
+        view->setMetadata(item);
         container->hoaItems.push_back(view);
         container->hoaList->addItem(view.get());
       }