amend 11ba1854 -- locked curve-evaluation is not public

diff --git a/libs/ardour/ardour/gain_control.h b/libs/ardour/ardour/gain_control.h
index c902cde00162a432dd646b68900f9bc7c57e2327..0a7bddcf4f3639465b4871f02b088cf5401ed665 100644 (file)
--- a/libs/ardour/ardour/gain_control.h
+++ b/libs/ardour/ardour/gain_control.h
@@ -45,12 +45,13 @@ class LIBARDOUR_API GainControl : public SlavableAutomationControl {
        double user_to_internal (double) const;
        std::string get_user_string () const;
 
-       bool get_masters_curve_locked (framepos_t, framepos_t, float*, framecnt_t) const;
-
        double lower_db;
        double range_db;
 
        void inc_gain (gain_t);
+
+protected:
+       bool get_masters_curve_locked (framepos_t, framepos_t, float*, framecnt_t) const;
 };
 
 } /* namespace */

diff --git a/libs/ardour/ardour/slavable_automation_control.h b/libs/ardour/ardour/slavable_automation_control.h
index 29ab2e1055a63da2763601ebfe451b50b7ecddc7..b24409b0a52edae2d1f3a8ac28063ccc3d95cc39 100644 (file)
--- a/libs/ardour/ardour/slavable_automation_control.h
+++ b/libs/ardour/ardour/slavable_automation_control.h
@@ -54,9 +54,6 @@ public:
                Glib::Threads::RWLock::ReaderLock lm (master_lock);
                return get_masters_curve_locked (s, e, v, l);
        }
-       virtual bool get_masters_curve_locked (framepos_t, framepos_t, float*, framecnt_t) const;
-
-       bool masters_curve_multiply (framepos_t, framepos_t, float*, framecnt_t) const;
 
        /* for toggled/boolean controls, returns a count of the number of
           masters currently enabled. For other controls, returns zero.
@@ -130,6 +127,9 @@ protected:
        void   actually_set_value (double value, PBD::Controllable::GroupControlDisposition);
        void   update_boolean_masters_records (boost::shared_ptr<AutomationControl>);
 
+       virtual bool get_masters_curve_locked (framepos_t, framepos_t, float*, framecnt_t) const;
+       bool masters_curve_multiply (framepos_t, framepos_t, float*, framecnt_t) const;
+
        virtual bool handle_master_change (boost::shared_ptr<AutomationControl>);
        virtual bool boolean_automation_run_locked (framepos_t start, pframes_t len);
        bool boolean_automation_run (framepos_t start, pframes_t len);