ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Robin Gareus 2017-06-13 17:57:58 +02:00
parent 23554fd185
commit b34d891b23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/gain_control.h
View File

@ -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 */

6
libs/ardour/ardour/slavable_automation_control.h
View File

@ -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);