From a5c3c05220f3e9711841246476f5013e60fe291a Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Fri, 26 Apr 2019 18:31:02 +0200 Subject: [PATCH] always push default value on object registration fix https://github.com/OSSIA/libossia/issues/377 --- OSSIA/ossia-max/src/object_base.cpp | 1 - OSSIA/ossia-max/src/object_base.hpp | 2 +- OSSIA/ossia-max/src/parameter.cpp | 11 +---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/OSSIA/ossia-max/src/object_base.cpp b/OSSIA/ossia-max/src/object_base.cpp index 98997764d07..85af39ec591 100644 --- a/OSSIA/ossia-max/src/object_base.cpp +++ b/OSSIA/ossia-max/src/object_base.cpp @@ -307,7 +307,6 @@ void t_matcher::set_parent_addr() object_base::object_base() { - } object_base::~object_base() diff --git a/OSSIA/ossia-max/src/object_base.hpp b/OSSIA/ossia-max/src/object_base.hpp index 35ab917ef36..e28befea0a5 100644 --- a/OSSIA/ossia-max/src/object_base.hpp +++ b/OSSIA/ossia-max/src/object_base.hpp @@ -117,7 +117,7 @@ struct object_base object_class m_otype{}; void* m_clock{}; - void* m_reg_clock{}; // registration clock that should be init in constructor + void* m_reg_clock{}; // registration clock that should be initialized in constructor // and canceled by loadbang method float m_rate{10}; diff --git a/OSSIA/ossia-max/src/parameter.cpp b/OSSIA/ossia-max/src/parameter.cpp index 5eaaf4f8a89..c043e1bc4ca 100644 --- a/OSSIA/ossia-max/src/parameter.cpp +++ b/OSSIA/ossia-max/src/parameter.cpp @@ -233,16 +233,7 @@ bool parameter::do_registration(const std::vector>& m set_repetition_filter(); set_recall_safe(); - auto& map = ossia_max::instance().root_patcher; - auto it = map.find(m_patcher_hierarchy.back()); - - if (it != map.end()) - { - if(it->second.is_loadbanged) - { - clock_delay(m_clock, 1); - } - } + clock_delay(m_clock, 1); return (!m_matchers.empty() || m_is_pattern); }