diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-07-16 16:13:24 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-07-16 16:13:24 -0500 |
| commit | 46c83693284ece4a732d26e62113ea4ac584d539 (patch) | |
| tree | 6e191e809b84b1c4d2aa36af6e8878996a109332 /libs/evoral/evoral/ControlList.hpp | |
| parent | edce75973c076ab1fa66cc6d601a30fcbbcd5dd4 (diff) | |
| parent | d9c0aa4236796d981a5d939bbc5d0d5a2e1910fe (diff) | |
merge fix
Diffstat (limited to 'libs/evoral/evoral/ControlList.hpp')
| -rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 7a828264bd..82868cd24c 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -124,8 +124,8 @@ public: void slide (iterator before, double distance); void shift (double before, double distance); - virtual void add (double when, double value, bool with_guards=true, bool with_default=true); - virtual void editor_add (double when, double value); + virtual void add (double when, double value, bool with_guards=true, bool with_initial=true); + virtual void editor_add (double when, double value, bool with_guard); void fast_simple_add (double when, double value); |