-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add splitting (and resizing) to all types of clips #7477
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.
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
Merged
Changes from 6 commits
Commits
Show all changes
119 commits
Select commit
Hold shift + click to select a range
09fccac
Initial clip splitting
regulus79 e010f28
Force midi clip splitting to be roudned to 1 bar
regulus79 ff8a47d
Make midi clip split into two clips and delete the old, instead of tr…
regulus79 8767dfd
Change splitting automation clips to be like midi clips: spawning two…
regulus79 fb2a222
Remove unecessary spacing and replace iterator type with auto
regulus79 70cf4dc
Invert if statement to return false early
regulus79 06b645e
Separate brackets from code with space
regulus79 4afdc87
Add space between for and parentheses
regulus79 c287cd0
Change spacing in if statment
regulus79 0f92817
Make param comment multiline
regulus79 6108c5d
Add spaces between // and comments
regulus79 360a5d1
Add space between if and parentheses
regulus79 273520c
Remove space between const and *
regulus79 607e810
Remove space between const and star again
regulus79 790a01f
Change code style for the other clip types
regulus79 1c45810
Code style changes for SampleClipView, plus inverting the if statement
regulus79 292e998
Update comment in ClipView.h
regulus79 da2e97c
Remove comments from .cpp files, and add single comment in ClipView.h
regulus79 c1f2928
Make rounded_pos lowerCamelCase
regulus79 de01890
Declare movedNote on the stack
regulus79 2995ba8
Force left clip to remain at original position after splitting
regulus79 72356bf
Change Knife Mode button tooltip
regulus79 ac8a1c4
Make knife cursor appear for all types of clips
regulus79 19b6916
Make double-click do nothing when in knife mode
regulus79 b2db31a
Fix midi clips having wrong length after splitting
regulus79 aa773a0
Remove spaces to fix code style
regulus79 39a8bb3
Use removeNodes() instead of recreating entire left clip
regulus79 a39be95
Add split marker to all clip types, and remove bar rounding on midi c…
regulus79 8f3955a
Do not populate notes as quantized in the new midi clips
regulus79 df5b49b
Change remove() to close() to fix undoing bug
regulus79 bf7d1f2
Remove spaces to fix code style
regulus79 6d13da1
Make splitClip() pure virtual
regulus79 19837bc
Remove whitespace
regulus79 f8b763c
Remove whitespace from PatternClipView
regulus79 7974445
Remove whitespace from AutomationClipView
regulus79 650b8b4
Remove whitespace from ClipView
regulus79 858330a
Initialize variables in AutomationClip's copy constructor
regulus79 e1269e7
Use remove() instead of close() to solve problem of midi clip playing…
regulus79 aa655ec
Fix automation clip behavior with out/in vals and tangents
regulus79 037497d
Simplify tangent setting code
regulus79 3c858b5
Allow resizing automation clips from the left and update splitting to…
regulus79 e8c25f0
Change offset from float to int
regulus79 6df2daf
Add/remove spacing around parentheses
regulus79 f0134ba
Change
regulus79 ccbb00d
Only automatically resize automation clips if the user has not resize…
regulus79 690f841
Make midi clips resizeable
regulus79 c7c4ff4
Cut off NotePlayHandles extending past end of clip
regulus79 599680a
Play notes overlapping with start
regulus79 bad83a0
Simplify code now that all clips are resizable
regulus79 959a99b
Add clip bounds overlay to piano roll and automation editor
regulus79 b0740b9
Merge branch 'master' into add-clip-splitting
regulus79 eb973df
Reset start offset when editing midi clip as pattern
regulus79 781beea
Update lambda syntax to c++20
regulus79 51007bd
Fix midi clip play length in piano roll to account for start offset
regulus79 4e20e2b
Fix merging midi clips to only merge visible notes
regulus79 cd895c3
Fix scrolling range in editors to account for start offset
regulus79 7eab22f
Limit PianoRoll playback to within clip bounds
regulus79 a86f509
Clamp pianoroll playhead position when opening editor
regulus79 aa725ad
Move mergeClips to MidiClipView
regulus79 49cc5f7
Add rightclick option to delete notes outside of clip bounds and rese…
regulus79 37dd961
Update icon
regulus79 2321726
Update editors when clip length changes
regulus79 9c08dee
Add explicit splitting via shift-knife
regulus79 92363ab
Update hints
regulus79 bcb3521
Add option to toggle auto resize, and tweak name of the other feature
regulus79 6b2ef42
Update hint depending on clip type
regulus79 9ebd3ff
Fix regression with midi clip splitting
regulus79 6a7d880
Update knife button tooltip
regulus79 5d3e35e
Add classic icon and change icon name
regulus79 3cdb590
Tweak classic icon
regulus79 38665bd
Change parameter name from splitExplicit to hardSplit
regulus79 bbfa4ac
Add option to toggle auto-resize in automation clips
regulus79 868b987
Add new icon for enabling/disabling auto-resize
regulus79 d3ca57b
Make hard-split midi clips hasBeenResized=true
regulus79 c969158
Add copy constructor to Clip, and use the copy constructor for all cl…
regulus79 e7faa8a
Reorder initialization
regulus79 bf23323
Generalize splitClip code in virtual function (and add Clip::clone), …
regulus79 43d2f18
Make clip copy constructors protected, and fix marker drawing if spli…
regulus79 1e7cfe7
Remove debug and fix formatting
regulus79 1be3077
Restore relative to start/end quantization, but have it combined with…
regulus79 85935c6
Fix marker line not disappearing after split
regulus79 abe7103
Make DetuningHelpers unique in Note constructors, and add copy constr…
regulus79 378c999
Remove sharedObject inheritance from InlineAutomation
regulus79 0658332
Make marker line consistant and themeable
regulus79 9c4308a
Change rgba to rgb
regulus79 278ee11
Rename hard splitting to destructive splitting, and clean up misc code
regulus79 93fb996
Fix midi clip hard splitting hasBeenResized
regulus79 16b2dad
Fix mistake
regulus79 0eac1ad
Fix empty clip size after destructive splitting
regulus79 3b98db5
Fix destructive split undo
regulus79 b3cd3d9
Merge branch 'master' into add-clip-splitting
regulus79 e3aaaab
Fix Style
regulus79 74b2afd
Update include/Clip.h
regulus79 0581e62
Change const TimePos & to const TimePos
regulus79 88a3d7b
Make splitClip not virtual, and make destructive splitting default to…
regulus79 212eaca
Fix hard splitting
regulus79 c5d3ec6
Merge branch 'master' into add-clip-splitting
regulus79 9bfa48b
Attempt to fix merge conflict again
regulus79 f865579
Make Note store its detuning as a unique_ptr
regulus79 76bae6b
Make InlineAutomation's AutomationClip std::unique_ptr
regulus79 716783e
Fix merging clips when the start/end of the note is outside clip bounds
regulus79 aa8041b
Simplify and clean up checks for notes partially out of bounds
regulus79 eb03363
Move variables out of for loop
regulus79 d9b5673
Make mergeClips resize resulting clip to extend from min/max of input…
regulus79 a1aa7e7
Fix SampleClip copy constructor
regulus79 870ce02
Make auto-resize toggle work with selections
regulus79 23f0c13
Fix bug with bulk toggle auto resize
regulus79 9475741
Quick fix undo for bulk toggle auto resize
regulus79 0d765d5
Refactor auto resize toggling to be simpler and support all clip type…
regulus79 eadd040
Fix bug with hard splitting when the left clip has start offset
regulus79 b925db1
Make right clip set hasBeenResized to true
regulus79 ea31c05
Fix notes being quantized in clearNotesOutOfBounds
regulus79 ef10305
Make automation clip auto-resize reset start offset
regulus79 e51b5f8
Merge branch 'master' into add-clip-splitting
regulus79 7c63007
Merge branch 'master' into add-clip-splitting
regulus79 b56391f
Fix Automation Clip FlipX (and make valueAt take the time realtive to…
regulus79 5bc9de8
Make Midi and Automation clips not resizable left past the start
regulus79 d37ca59
Rename get/setAutoResize to get/setResizable
regulus79 e3a06af
Rename hasBeenResized to autoResize
regulus79 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.