diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h index 44c3def712..33ce1805d1 100644 --- a/libs/ardour/ardour/triggerbox.h +++ b/libs/ardour/ardour/triggerbox.h @@ -41,14 +41,6 @@ class XMLNode; -namespace ARDOUR { - namespace Properties { - LIBARDOUR_API extern PBD::PropertyDescriptor use_follow; - LIBARDOUR_API extern PBD::PropertyDescriptor running; - LIBARDOUR_API extern PBD::PropertyDescriptor legato; - LIBARDOUR_API extern PBD::PropertyDescriptor quantization; - } -} namespace ARDOUR { @@ -313,6 +305,17 @@ class LIBARDOUR_API TriggerBox : public Processor static const uint64_t default_triggers_per_box; }; +namespace Properties { + LIBARDOUR_API extern PBD::PropertyDescriptor use_follow; + LIBARDOUR_API extern PBD::PropertyDescriptor running; + LIBARDOUR_API extern PBD::PropertyDescriptor legato; + LIBARDOUR_API extern PBD::PropertyDescriptor quantization; + LIBARDOUR_API extern PBD::PropertyDescriptor launch_style; + LIBARDOUR_API extern PBD::PropertyDescriptor follow_action0; + LIBARDOUR_API extern PBD::PropertyDescriptor follow_action1; +} + + } // namespace ARDOUR namespace PBD { diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index 609503214e..01de7f3eac 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -38,6 +38,9 @@ namespace ARDOUR { PBD::PropertyDescriptor running; PBD::PropertyDescriptor legato; PBD::PropertyDescriptor quantization; + PBD::PropertyDescriptor launch_style; + PBD::PropertyDescriptor follow_action0; + PBD::PropertyDescriptor follow_action1; } } @@ -98,6 +101,11 @@ Trigger::set_follow_action (FollowAction f, uint64_t n) { assert (n < 2); _follow_action[n] = f; + if (n == 0) { + PropertyChanged (Properties::follow_action0); + } else { + PropertyChanged (Properties::follow_action1); + } } void @@ -106,6 +114,7 @@ Trigger::set_launch_style (LaunchStyle l) _launch_style = l; set_usable_length (); + PropertyChanged (Properties::launch_style); } XMLNode& @@ -815,6 +824,12 @@ Trigger::make_property_quarks () DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for use-follow = %1\n", Properties::use_follow.property_id)); Properties::quantization.property_id = g_quark_from_static_string (X_("quantization")); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for quantization = %1\n", Properties::quantization.property_id)); + Properties::launch_style.property_id = g_quark_from_static_string (X_("launch-style")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for quantization = %1\n", Properties::launch_style.property_id)); + Properties::follow_action0.property_id = g_quark_from_static_string (X_("follow-action-0")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for follow-action-0 = %1\n", Properties::follow_action0.property_id)); + Properties::follow_action1.property_id = g_quark_from_static_string (X_("follow-action-1")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for follow-action-1 = %1\n", Properties::follow_action1.property_id)); } const uint64_t TriggerBox::default_triggers_per_box = 8;