From 71f088dbbddb2cd0d0ce11b20ceb92196f0ba611 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 18 Jun 2020 16:26:44 -0600 Subject: [PATCH] move virtual method requiring std::min from header into .cc The method is virtual so it could never have been inlined anyway --- libs/pbd/controllable.cc | 7 +++++++ libs/pbd/pbd/controllable.h | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 16e03d8827..91baf49198 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -158,3 +158,10 @@ Controllable::dump_registry () } cout << "Total number of registered sontrollables: " << cnt << "\n"; } + +void +Controllable::set_interface (float fraction, bool rotary, GroupControlDisposition gcd) +{ + fraction = std::min (std::max (0.0f, fraction), 1.0f); + set_value (interface_to_internal (fraction, rotary), gcd); +} diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 079d922a48..e4fa6a9934 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -131,10 +131,7 @@ public: /** Get and Set `interface' value (typically, fraction of knob travel) */ virtual float get_interface(bool rotary=false) const { return (internal_to_interface(get_value(), rotary)); } - virtual void set_interface (float fraction, bool rotary=false, GroupControlDisposition gcd = NoGroup) { - fraction = std::min (std::max (0.0f, fraction), 1.0f); - set_value (interface_to_internal (fraction, rotary), gcd); - } + virtual void set_interface (float fraction, bool rotary=false, GroupControlDisposition gcd = NoGroup); virtual std::string get_user_string() const { return std::string(); }