From 746d5c6624727fa92ee1f15a1c5192b9d44b9961 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Jan 2016 11:57:55 -0500 Subject: [PATCH] add API to allow mackie controls to use GroupControlDisposition --- libs/surfaces/mackie/controls.cc | 4 ++-- libs/surfaces/mackie/controls.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index 8ed0bad311..be13bc93bd 100644 --- a/libs/surfaces/mackie/controls.cc +++ b/libs/surfaces/mackie/controls.cc @@ -78,10 +78,10 @@ Control::set_control (boost::shared_ptr ac) } void -Control::set_value (float val) +Control::set_value (float val, PBD::Controllable::GroupControlDisposition group_override) { if (normal_ac) { - normal_ac->set_value (normal_ac->interface_to_internal (val), PBD::Controllable::NoGroup); + normal_ac->set_value (normal_ac->interface_to_internal (val), group_override); } } diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h index 38eb30fb65..c53be76891 100644 --- a/libs/surfaces/mackie/controls.h +++ b/libs/surfaces/mackie/controls.h @@ -27,6 +27,7 @@ #include +#include "pbd/controllable.h" #include "pbd/signals.h" #include "mackie_control_exception.h" @@ -70,7 +71,7 @@ public: virtual void set_control (boost::shared_ptr); float get_value (); - void set_value (float val); + void set_value (float val, PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup); virtual void start_touch (double when); virtual void stop_touch (bool mark, double when);