Skip to content

Automation Pattern - Rename 'controlKey' #3459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasp00 merged 1 commit into from
Mar 28, 2017
Merged

Automation Pattern - Rename 'controlKey' #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/AutomationPattern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class EXPORT AutomationPattern : public TrackContentObject
MidiTime putValue( const MidiTime & time,
const float value,
const bool quantPos = true,
const bool controlKey = false );
const bool ignoreSurroundingPoints = false );

void removeValue( const MidiTime & time );

Expand Down
4 changes: 2 additions & 2 deletions src/core/AutomationPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ void AutomationPattern::updateLength()
MidiTime AutomationPattern::putValue( const MidiTime & time,
const float value,
const bool quantPos,
const bool controlKey )
const bool ignoreSurroundingPoints )
{
cleanObjects();

Expand All @@ -221,7 +221,7 @@ MidiTime AutomationPattern::putValue( const MidiTime & time,

// Remove control points that are covered by the new points
// quantization value. Control Key to override
if( ! controlKey )
if( ! ignoreSurroundingPoints )
{
for( int i = newTime + 1; i < newTime + quantization(); ++i )
{
Expand Down