ardour/livetrax
13
0
Fork 0
Code
24,052 Commits 1 Branch 1 Tag 158 MiB
aeae859c46
Commit Graph

731 Commits

Author SHA1 Message Date
Paul Davis
e3c4f5fa98 make double-click on patch change launch patch change editor 2016-05-31 15:30:44 -04:00
Paul Davis
2c9c210213 manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus 2016-05-31 15:30:42 -04:00
Paul Davis
e0ff70cf86 first vaguely working version using PresentationInfo 
remote control ID and "order keys" have been removed.
 2016-05-31 15:30:42 -04:00
nick_m
a924e938aa Allow non-musical snap when dragging bbt ruler. 
- probably not what the user wants,
	  unless snapping beats to timecode frames.
 2016-05-28 06:50:22 +10:00
nick_m
0d17c21410 Revert 2d7f755 2016-05-28 05:17:43 +10:00
nick_m
2d7f755df6 Enable snap for tempo dilation. 2016-05-28 03:21:16 +10:00
nick_m
062e17a542 Don't change snap settings when dragging audio-locked meters. 2016-05-28 03:16:06 +10:00
nick_m
1c51cbcc82 Force snap when dragging meters. 2016-05-28 02:57:53 +10:00
nick_m
9506fd884d Restore snap setting in eterMarkerDrag::aborted()/ 2016-05-28 02:47:12 +10:00
nick_m
b9f70334b6 Dragging a meter sets editor snap type to bars during drag. 2016-05-28 00:48:18 +10:00
nick_m
aad7b129b6 Tempo ramps - rename meter/tempo_section_at() -> meter/tempo_section_at_frame() 2016-05-27 23:38:18 +10:00
nick_m
34c9ac9dd7 Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt() 2016-05-27 23:38:17 +10:00
nick_m
8f3bc6f809 Tempo ramps - rename tempo_at() -> tempo_at_frame().. 3 decimals for the audioclock tempo display. 2016-05-27 23:38:17 +10:00
nick_m
6e97f40d08 Tempo ramps - remove thinko 2016-05-27 23:38:17 +10:00
nick_m
390dea1684 Tempo ramps - fix comment 2016-05-27 23:38:17 +10:00
nick_m
389e35f7be Tempo ramps - ensure fake meter mark is under pointer during drags. 2016-05-27 23:38:17 +10:00
nick_m
de5f8dd3d3 Temper pants - fix newly added lockup while dragging tempos sometimes. 2016-05-27 23:38:17 +10:00
nick_m
43922a1fe1 Tempo ramps - clean up tempo dragging. 2016-05-27 23:38:17 +10:00
nick_m
6309807bc7 Tempo ramps - rename for consistency, remove some testing code, add meter based bbt->pulse conversions. 2016-05-27 23:38:17 +10:00
nick_m
f54b75c869 Tempo ramps - consolidate meter dragging code. 2016-05-27 23:38:17 +10:00
nick_m
8b2f73d5ac Tempo ramps - rework tempo drags, improve comments. 2016-05-27 23:38:17 +10:00
nick_m
f182235410 Tempo ramps - consolidate TempoMap::predict_tempo() 2016-05-27 23:38:17 +10:00
nick_m
d1a075110a Tempo ramps - more code cleanup, fix cross-marker jumping using tempo dialog bbt 2016-05-27 23:38:17 +10:00
nick_m
6894f468d4 Tempo ramps - no more tempo dilation on meter drag. 
- its now a bbt ruler / marker lane thing with the constraint modifier.
 2016-05-27 23:38:17 +10:00
nick_m
074db3b861 Tempo ramps - more code consolidation wrt add meter/tempo. 2016-05-27 23:38:16 +10:00
nick_m
2d3d7a5355 Tempo ramps - fix ambiguous api, fix flickering tempo curves. 2016-05-27 23:38:16 +10:00
nick_m
5ccfeea5bc Tempo ramps - more bbt dragging work. 
- display prev tempo and tempo at mouse while dragging
	- simplify ramp dilation somewhat.
 2016-05-27 23:38:16 +10:00
nick_m
abac4ce854 Tempo ramps - more bbt ruler dragging work. 2016-05-27 23:38:16 +10:00
nick_m
8724a9f68f Tempo ramps - improve constraint mod + bbt dragging begavior. 2016-05-27 23:38:16 +10:00
nick_m
86b0268e8b Tempo ramps - add visualtempo curve, dragging bbt or music rulers with constraint modifier dilates previous tempo. 2016-05-27 23:38:16 +10:00
nick_m
8b4f5dcd5f Tempo ramps - reinstate cross-dragging of music-locked meters, various bug fixes. 
- revert failed frameoffset_t experiment
	- caclulate meters using bbt
	- fix tempo dilation when first tempo is ramped.
 2016-05-27 23:38:16 +10:00
nick_m
992fc6b510 Tempo ramps - music-locked meter drags are now bbt based. 2016-05-27 23:38:16 +10:00
nick_m
3c76fa9dd1 Tempo ramps - fix various tempo dragging issues. 2016-05-27 23:38:16 +10:00
nick_m
8bcf57cad4 Tempo ramps - a different approach to audio-locked meters. 
- the bbt of a meter cannot be changed by moving tempos or other meters.
	  e.g. tempo motion will be disallowed if it would cause a bbt overlap
 2016-05-27 23:38:15 +10:00
nick_m
37ed0f6e9b Tempo ramps - restore correct drag behaviour wrt audio-locked meters and right-click of associalted tempo 2016-05-27 23:38:15 +10:00
nick_m
601ac8565d Tempo ramps - disallow tempo dilation on first meter. 2016-05-27 23:38:15 +10:00
nick_m
e0607ca913 Tempo ramps - add gui dilation of tempos. 
- a meter can be dragged using the constraint modifier, which
	  sets the previous tempo accordingly.
	  This could be added to the bbt ruler to allow direct dragging
	  of beats and bars, but the exact behavior of that is still
	  undecided. comments?

	- also preliminary work on the necessary tempos locked to
	  audio-locked meters.
 2016-05-27 23:38:15 +10:00
nick_m
29e0b2e5bf Tempo ramps - make moving music-locked meters less flakey, remove some code. 2016-05-27 23:38:15 +10:00
nick_m
b24ce3fbe9 Tempo ramps - one approach to audio-locked meters. 
- audio-locked meters retain their 'home' bar position
	  unless altered by another metric.
	  this is an alternative to a more strict model
	  which isn't quite so flexible.
 2016-05-27 23:38:15 +10:00
nick_m
9e1a1b801f Tempo ramps - fix copy/paste error. 2016-05-27 23:38:14 +10:00
nick_m
663814bf22 Tempo ramps - tempo marks use mvc-style copy drag, don't crash if two successive ramped tempos are the same :| 2016-05-27 23:38:14 +10:00
nick_m
c5790b1cb6 Tempo ramps - fix dragging audio-locked meters across each other. 2016-05-27 23:38:14 +10:00
nick_m
eeb479618b Tempo ramps - fix thinko in meter drag aborted handling 2016-05-27 23:38:14 +10:00
nick_m
a837ce28f5 Tempo ramps - don't replace the meter when drag finished. handle aborted. 
- meter has already been placed there.
 2016-05-27 23:38:14 +10:00
nick_m
3059adea7b Tempo ramps - fix for dragging audio-locked meters over no time. 2016-05-27 23:38:14 +10:00
nick_m
96cf262c23 Tempo ramps - meters can be dragged across each other. 
- also removes some fairly silly code,
 2016-05-27 23:38:14 +10:00
nick_m
3048758369 Tempo ramps - copy-drag meters works again. 
- meter drags now use mvc style.
 2016-05-27 23:38:13 +10:00
nick_m
3d07cd79e1 Tempo ramps - api change, remove some code. 2016-05-27 23:38:13 +10:00
nick_m
b5021eb7f3 Tempo spamr - smallify some code. 2016-05-27 23:38:13 +10:00
nick_m
5d37fc6e36 Tempo ramps - more multi audio-locked meter work, code reorganisation. 2016-05-27 23:38:13 +10:00
nick_m
b39db7ebeb Tempo ramps - a saner way to snap music-locked tempos. 2016-05-27 23:38:13 +10:00
nick_m
6b7dd59b7a Tempo ramps - fix incorrect verbose cursor during tempo drag. 2016-05-27 23:38:13 +10:00
nick_m
a9714de9b9 Tempo ramps - tempo drags respect the snap modifier. add some documentation. 2016-05-27 23:38:13 +10:00
nick_m
354567e5a7 Tempo ramps - switch MusicLocked tempos to beat-based dragging. fix various bugs wrt future-snapped tempo drags 2016-05-27 23:38:12 +10:00
nick_m
daa07ce6e0 Tempo ramps - tempos now musically snap to their future. 2016-05-27 23:38:12 +10:00
nick_m
cb43d485fa Tempo ramps - another approach to first meter/tempo. 
- first tempo is glued to first meter position as they are now
	  both locked to AudioTime.
	- all existing audio-locked tempos to the left of the first meter
	  are made inactive. all to the right are made active.
 2016-05-27 23:38:12 +10:00
nick_m
4de28f0745 Tempo ramps - fix just-introduced undo crash. 2016-05-27 23:38:12 +10:00
nick_m
a64e46a6b3 Tempo ramps - allow constraint-drag of first tempo. 2016-05-27 23:38:12 +10:00
nick_m
69b6379b23 Tempo ramps - pressing constraint modifier keys during tempo drag changes tempo with vertical movement, incorporating beat constraint (if present). 
- makes it easy to find suitable accelerandos for hit points in conjunction
	  with playhead position, beat-locked tempos and initial meter frame.
 2016-05-27 23:38:12 +10:00
nick_m
3c2ad63de7 Tempo ramps - complete 'music locked meters are now positioned using beats' transition. 2016-05-27 23:38:12 +10:00
nick_m
99efddb050 Tempo ramps - various bug fixes (meter drag undo, incorrect copy) 2016-05-27 23:38:12 +10:00
nick_m
58d4889ad3 Tempo ramps - music-locked meters now use beats rather than pulses as their reference. 
- fixes many problems with a non-zero audio-locked first meter.
 2016-05-27 23:38:12 +10:00
nick_m
b47bb55226 Tempo ramps - improve music-locked meter drags, improve dump(). 
- dump now shows cross-calculation of tempo positions.
 2016-05-27 23:38:11 +10:00
nick_m
b415b59f79 Tempo ramps - respect tempo note type and meter note divisor correctly. 
- tempo and meter position is now pulse-based,
	  although meter still has a beat for convenience.
 2016-05-27 23:38:11 +10:00
nick_m
ec791c8dd4 Tempo ramps - hook up tempo display, a new approach to audio-locked meters 
- audio locked meters define an offset which is used for all public
	  TempoMap methods while the internal map remains contiguous.
	  Probably a few unexpected consequences here, but seems to work mostly.
 2016-05-27 23:38:11 +10:00
nick_m
278ad73259 Tempo ramps - check for impossible locations tempo dialog bbt entry. reorganise code. 2016-05-27 23:38:11 +10:00
nick_m
36ec551a8a Tempo ramps - fix music-locked meter drags. 2016-05-27 23:38:11 +10:00
nick_m
a0558694df Tempo ramps - audio-locked meters have a bbt of 1|1|0 
- possibly lots going wrong with this due to multiple occurences
	  of 1|1|0.
 2016-05-27 23:38:11 +10:00
nick_m
6ecef52d76 Tempo ramps - meter sections drag again. 2016-05-27 23:38:11 +10:00
nick_m
989089a4e9 Tempo ramps - add method to handle beat-based tempo reordering. clean code. 2016-05-27 23:38:11 +10:00
nick_m
452e484faf Tempo ramps - rework mouse dragging of tempo marks, derive beat_at_tempo() and tempo_at_beat(). 2016-05-27 23:38:11 +10:00
nick_m
bc42dea451 Tempo ramps - first stab at metric marks locked to frames or beats. 
- pretty much untested.
 2016-05-27 23:38:10 +10:00
nick_m
28127b1768 Tempo ramps - Remove the tick walk, store c_func, document the approach. 2016-05-27 23:38:10 +10:00
nick_m
87d49cd6ec Tempo ramps - api rename, fix various meter and tempo dialog bugs. 2016-05-27 23:38:10 +10:00
nick_m
5c6e18e6a0 Tempo ramps - remove the concept of bars from tempo sections. 
- this helps where tempo and meter have a somewhat circular
	  dependency.

MetricSection now has a musical position expressed in beats (a double).
MeterSection still has a bbt, but it really isn't needed as we have
enough information to discover the number of bars at a given beat without it.
TempoSection now has a hack to enable loading of legacy sessions, which will
ultimately be a lot cleaner than the current code.

Removing bars from tempo sections also allows us to place them
at arbitrary frames (implemented here).
 2016-05-27 23:38:09 +10:00
nick_m
340bd42c62 Tempo ramps - allow live updating of tempo markers. 
- all a bit slow, but should be ok once we can lock
	  markers to frames.
 2016-05-27 23:38:09 +10:00
nick_m
dbfe991cd8 Tempo ramps - fix changing from const to ramp in the gui. 
- also fixes some midi mouse over problems
	- start using replacements for frames_per_bar() frames_per_beat() etc.
 2016-05-27 23:38:09 +10:00
nick_m
7fc3b0c34c Initial stab at tempo ramps. 
Replaces the list of points in TempoMap with TempoSection functions, which
compute tempo-at or tick-at time relative to tempo section start.
TempoMap consults them additively to determine things like bbt_time(),
frame_time() get_grid() etc.
This has a marked effect on scrolling speed along with the code simplification
in the places it has been attempted.

Several things are broken here.
Currently every ramp except the last one is an exponential ramp. this may
be simple to fix :).
Mouse-over midi grid doesn't match mouse click grid. should also be simple.

Many things seem to work, but their accuracy should be in question until
each area has been addressed.
 2016-05-27 23:38:09 +10:00
Paul Davis
ff9bb1886a single click in timefx mode should still show dialog, allow user to set parameters 2016-02-22 15:31:26 -05:00
Paul Davis
84de4246bb correct fix previous merge conflict 2016-02-22 15:31:23 -05:00
Paul Davis
16731d07d3 remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables 2016-02-22 15:31:22 -05:00
Paul Davis
9010262bed first compilable version of tabbable design. 
I would have loved to split this apart, but there are just so many interrelated changes,
it makes little sense and would be a huge effort that would break future git bisect
use because so many intermediate commits would not compile
 2016-02-22 15:31:21 -05:00
Adrian Knoth
6fa88273aa Spelling correction patch from Debian 
Patch taken (and forward-ported to HEAD) from
<https://anonscm.debian.org/cgit/pkg-multimedia/ardour.git/plain/debian/patches/0100-fix-typos.patch>
 2016-02-22 15:13:01 -05:00
Tim Mayberry
90e35c7143 Fix bug #6762, MIDNAM note read outs don't work when dragging MIDI note 
Also fixes it so the key is selected in the piano roll header
 2016-02-11 08:17:18 +10:00
Tim Mayberry
f315c0910d Fix bug 6735, Take into account snap to when stretching regions in Editor 2016-01-21 14:07:49 +10:00
nick_m
4bb5278b62 Drag - Don't snap _last_pointer_frame when leaving autoscroll. 2015-12-08 04:34:28 +11:00
nick_m
6bd842e301 Use correct position when finishing tempo and meter marker drags. 2015-12-08 04:31:59 +11:00
nick_m
c4203f848e Don't snap twice when moving regions. 2015-12-08 03:36:53 +11:00
Tim Mayberry
9694dfc8d2 Fix bug #6506, crash when moving tempo markers with automation on midi tracks 2015-11-16 09:57:04 +10:00
nick_m
024adf3a4d Fix #6673 - another prematurely closed undo transaction. 
- add_midi_region used to commit, resulting in
	  _region->set_position() adding a command when there was
	  no current transaction. The sub-bug here was that repeatedly
	  calling set_position() on the new region resulted in nonsensical
	  automation movement after the drag.
 2015-11-14 03:14:23 +11:00
nick_m
d5c4d068b0 Fix snap modifiers not working on notes when grid is set to off. 2015-10-31 06:02:54 +11:00
nick_m
5e7c7e52bd Use automation line's frame of reference for y position. 
- removes the need for 'pixel hunting' wrt NAME_HIGHLIGHT_SIZE.
	- new control points generated by clicking on a line are placed
	  where the verbose canvas cursor says they are.
 2015-10-30 21:14:16 +11:00
nick_m
6d98ccf901 Dont do duplocate calls to MidiRegionView::trim_front_ending () in TrimDrag. 
- fixes #6658
	- also leaves undo history alone if point trim does nothing.
 2015-10-30 04:01:44 +11:00
nick_m
73328172d6 Fix reversed ratio in last commit. 2015-10-30 00:01:33 +11:00
nick_m
36dd7f8d9d Start line drag using canvas y coords. 
- fixes #5759
 2015-10-29 23:37:01 +11:00
nick_m
61729f8e68 LineDrag fixes wrt initial drag position and display of y value. 2015-10-28 05:33:43 +11:00
nick_m
fc8b03eef5 Fix incorrectly placed control points (y-axis). fixes #6647. 
- also use the return from AutomationLine::drag_motion () in
	  anticipation of it correctly reporting its clamping to
	  AutomationRangeDrag.
 2015-10-28 02:46:03 +11:00
nick_m
e78a44d4e5 Markers use the selection change stack. 2015-10-25 05:26:44 +11:00
nick_m
90aec831cb Relative snap for markers. 
- also removes many uninitialised variable warnings in
	  editor_drag.cc found by cppcheck.
 2015-10-24 04:59:57 +11:00
nick_m
c9864b71a0 ResizeNoteDrag selection click behaves as NoteDrag's does. 2015-10-24 01:19:00 +11:00
nick_m
96524d863b Clear point selection when uniquely selecting a note. 
- Also fix selection undo when creating notes w/control
	  in MouseContent mode.
 2015-10-24 00:07:03 +11:00
nick_m
d295fe12e4 Click on a selected note unique selects it (as per regions, control points). 2015-10-20 00:53:30 +11:00
nick_m
986a3a9775 Don't snap if fine adjust modifier used. 
- permits non-alt modifier for fine adjust.
 2015-10-20 00:53:29 +11:00
nick_m
6fe6f95d04 Fix for fine adjust overriding snap modifiers. 2015-10-20 00:53:29 +11:00
nick_m
17294ab9ec Make control point selection more consistent. 
- disallow simultaneous events via ControlList::editor_add ()
	- clicking on an automation line selects the points that define it.
	- don't 'flash' a region selection when using mousedraw mode.
	- cp click selection resembles region selection.
	- region gain points respect snap modifier (a la automation points).
 2015-10-20 00:53:27 +11:00
Robin Gareus
f307080808 disable follow-edits with external sync #6577 2015-10-18 02:03:41 +02:00
Robin Gareus
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
Paul Davis
4dc63966f0 globally remove all trailing whitespace from ardour code base. 
Paul Davis was responsible for introducing almost all of this.
 2015-10-04 14:51:05 -04:00
Tim Mayberry
6b019a4953 Move UIConfiguration Singleton into UIConfiguration header 
This removes the direct dependence on ardour_ui.h from 39 files
 2015-09-16 16:55:17 -04:00
Robin Gareus
c315c6f140 Allow to override A/V-lock (when moving audio) 2015-09-08 02:51:58 +02:00
Robin Gareus
88f532ed6a Allow to override A/V-lock (when moving video) 2015-09-08 01:35:35 +02:00
Robin Gareus
f1fab06862 fix midi note de-select #6534 2015-08-28 02:25:48 +02:00
nick_m
1963c3ff10 Allow creation of region gain points by clicking on a line. 
- Also fixes new AutomationLine points having huge offsets
	  on creation via line click (window vs canvas event sample).
 2015-08-27 02:20:43 +10:00
Robin Gareus
aa3eb11fb3 fix typo in prev commit 2015-08-20 02:27:24 +02:00
Robin Gareus
89b0817f83 fix "locked" + "locked to video" bug. 
previously if some audio region was locked and locked to video,
the audio-region always stayed put and the video could only be
moved forward.

TODO: add an "unlock all" option.
 2015-08-20 02:24:27 +02:00
Tim Mayberry
bb79071038 Fix undo/redo when changing fade out length 
This may fix bug #6518 or there may be more issues to be found
 2015-08-19 13:56:12 +10:00
Tim Mayberry
07dc805919 Fix bug #6337, clicking in canvas without session loaded causes crash 2015-08-14 16:04:24 +10:00
Robin Gareus
7a3b6e6d08 remove more cruft (dead assignments) 2015-08-07 21:16:14 +02:00
Robin Gareus
e1f168de11 rename Marker class 
Classes are in the global namespace.
OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
 2015-07-23 17:58:40 +02:00
Ben Loftis
46c8369328 merge fix 2015-07-16 16:13:24 -05:00
Paul Davis
7592b5d3e1 correctly track range selection trim and drag creation w.r.t playback priority 2015-06-29 14:18:13 -04:00
nick_m
1768e9817e Fix another LineDrag click crash. 2015-06-19 03:39:51 +10:00
nick_m
dcd3e3823c Don't begin command on start_grab for AutomationRangeDrag and NoteResizeDrag 
- fixes a crash when clicking to resize without movement.
	- minor readability fix for _drag_had_movement
 2015-06-19 00:02:09 +10:00
nick_m
16109ebcc8 Rework last commit, clicking on an automation line no longer adds history. 
- fixes a crash when clicking on automation lines repeatedly.
 2015-06-18 06:27:37 +10:00
nick_m
0280989276 Single control points can now be dragged up and down properly. 
- preserves the zero notch, but doesn't mess up the cumulative drag.
 2015-06-18 04:42:30 +10:00
nick_m
639750f815 Don't add history by clicking a control point, fix control point selection. 
- also make set_selected_control_point_from_click () return
	  something useful.
 2015-06-18 03:48:39 +10:00
nick_m
44790ebff0 More _reversible_command() auditing in the gui. 
- try to keep begin/commit pairs in the same file where possible.
 2015-06-17 09:54:23 +10:00
nick_m
4c1d79af4a Unbreak region brush drag wrt undo, avoid some dangling commands in the gui 
- also allow moving of automation lines in internal mouse mode.
	- this is also a first pass at ensuring that if an operation does
	  nothing, avoid an undo entry.
 2015-06-17 09:54:22 +10:00
nick_m
15819f0896 Automation -use editor_add in gui, record straight lines with fewer points. 
- don't keep setting/unsetting write pass when transport frame
	  remains the same (think larger jack buffer sizes)
	- insert guards are now 64 frames after when.
	- refactor previous approach.
 2015-06-17 09:54:22 +10:00
nick_m
392f48709c Magnetic snap now works on note moves / resizes. 2015-06-11 02:20:37 +10:00
nick_m
b3a4c88e0e Make absolute snap the default snap. 
- also fixes a couple of absolute snap bugs wrt midi notes.
 2015-06-11 01:36:34 +10:00
nick_m
39d4bbf5e1 Clarify the convention on modifiers and drags. 2015-05-23 23:19:00 +10:00
nick_m
406bcb4dfe Proper initialisation of _x/y_constrained. 2015-05-23 22:59:19 +10:00
nick_m
ea8b5a970f Bring back contrained drag modifier with preference setting. 
- this should work as before, but when applied to a button 1 drag,
	  the constraint is in the first direction travelled.
 2015-05-23 05:36:03 +10:00
nick_m
88477ace25 Fix inverted logic of SnapOff with snap modifiers pressed. 
- also clean up, rename and comment some previous hanges.
 2015-05-23 03:09:48 +10:00
nick_m
784abd03e0 Make note drags and resizes obey the disable sanp modifier. 2015-05-22 06:54:16 +10:00
nick_m
37ee083931 Small cleanup 2015-05-22 04:48:34 +10:00
nick_m
65e06fa350 More cleanup 
- remove "no_magnets" ugh.
 2015-05-22 04:26:16 +10:00
nick_m
7edf0e17bc Clean up a bit - should be a no-op 2015-05-22 03:09:29 +10:00
nick_m
eaf49f02ff Fix up modifier behaviour 
- its now possible to use snap modifiers in combination with others
	  afaict this hasn't worked for some time.

	- use "contains" rather than "equals" during drag. Still uncertain
	   about this wrt beginning a drag. for now they are all "equals".

	- probably solve the "snap modifier modifier" problem using
	  ArdourKeyboard::indicates_snap () and friend.
 2015-05-22 02:12:58 +10:00
nick_m
186736043c Move ui-centric modifiers into ArdourKeyboard, set some bad defaults. 
- Also makes "Mod4" Appear as "Windows" and adds new combination
	"Alt-Windows" to the dropdown.
	- Attempt to set a pair of default snap modifiers (without
	knowing what it actually is for OSX)
	- Copy modifier now saves
	- Snap modifier modifier problem still remains.
 2015-05-21 05:32:23 +10:00
nick_m
ae0759ae88 Allow all drag -related modifiers to be set, re-instate "jump after trim" 
- Copy modifier still doesn't save
	- Testers please edit the Extra section of ~/.ardourN/config to allow
	defaults to "take"
	- Note that the current defaults overlap.
	- warning - absolute snap modifier has no default and will be always
	"on" unless you set it!
 2015-05-21 01:30:57 +10:00
nick_m
66221d1dea Add more modifier preferences. 
Note that no defaults are set - go to prefs->user interaction to
	ensure that nothing is set to "no modifer"

	also - the copy modifier doesn't actually save its state yet.
 2015-05-20 04:00:04 +10:00
nick_m
dc50730059 Revert to old Lock mode (still called Lock). 
Also make midi notes obey the snap delta modifire
 2015-05-19 03:27:50 +10:00
nick_m
aac167a19f "Lock" mode is now "Constrained", make snap absolute modifier configurable. 
- user can abs/rel modifier key in prefs->user interaction
	  suggested for linux - absolute->alt ignore snap->alt-shift
	- Constrained mode works the same as button 2 drag (initial move
	  sets constraint axis).
 2015-05-18 06:25:36 +10:00
nick_m
799e619690 Relative snap now always on - disabled with Tertiary modifier (shift) 2015-05-18 03:15:22 +10:00
nick_m
a0bd6975d2 Clean up drag modifiers. 
Button 2 drag now is constrained to initial move axis, removing
	all modifiers from this op.
	Remove Jump after trim mode.
	TrimDrag now has:
		Primary for trim anchored to fade.
		Secondary for contents trim (as before)
		Primary & Tertiary for "non overlap" trim
	All drags have Tertiary for relative snap
 2015-05-18 01:43:44 +10:00
nick_m
c359f881a1 Relative Snap -make it activated by the tertiary modifier during drag. 
Disabled/enabled with the shift key. no config stuff at all now.
	Move existing (strange) trim feature to primary + tertiary modifiers.
 2015-05-17 23:47:01 +10:00
nick_m
91a34c596d Relative snap - support magnetic mode (hackishly for now) 2015-05-17 04:26:05 +10:00
nick_m
bbafb8f137 Cleanup relative snap code. 2015-05-17 00:23:25 +10:00