13
0
Commit Graph

16590 Commits

Author SHA1 Message Date
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
224b85d038 Appease Our Dear Leader 2015-05-22 02:31:25 +10:00
nick_m
b7348bf4f5 Fix excessive use of logic. 2015-05-22 02:20:51 +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
5d176eefa6 Make the prefs less squashed looking, add another entry for OSX modifiers.
- Defaults are probably still wrong, but at least they are actual
	keys.
2015-05-21 23:47:32 +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
0d8a331bca Remove some debugging. 2015-05-19 03:29:22 +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
nick_m
6831d8a5aa Fix typo. 2015-05-16 06:10:02 +10:00
nick_m
c8303c8b7e Revert incorrect region_length() definition. 2015-05-16 04:50:37 +10:00
nick_m
68a8330afc Relative snap 2015-05-16 04:15:52 +10:00
e73b4e6f55 fix cleanup (code is self-evident). From Yevgeny @ waves 2015-05-14 07:01:01 -04:00
4d2d693190 Fix stuck notes on save during MIDI playback. 2015-05-12 20:10:23 -04:00
nick_m
16ded1acac Fix missing undo for audio timefx operations. 2015-05-13 02:30:52 +10:00
f716595fa5 fix C++ template/operator test 2015-05-12 11:38:55 -04:00
d0aefb28b9 catch identifiers ending or starting with _ when checking operator spacing 2015-05-12 11:25:36 -04:00
af1288ed62 don't interpret C++ templates with indirection/pointer/reference operators as operators 2015-05-12 11:23:57 -04:00
163131f4b8 add check for white-space only lines; fix tests to allow for _(...) macro and function (); rather than function () ; 2015-05-12 08:02:07 -04:00
deeb5652e2 add pre-commit hook for optional (but recommended) use 2015-05-09 13:51:21 -04:00
a4a6747001 whitespace cleanup 2015-05-09 13:50:06 -04:00
8ab0b99bee fix pasted whitespace 2015-05-09 13:42:39 -04:00
d6a6444b90 C/C++ style checking script from erik de castro-lopo, for use in client-side pre-commit hook 2015-05-09 13:42:39 -04:00
nick_m
13f34f3922 Layering - the return of "later is higher".
Currently we don't do anything special on layering prefs change
    (relayer only occurs when each playlist is first edited). The idea here is
    that "undo" is still available to restore previous layering in case of any
    surprises.
2015-05-10 03:15:50 +10:00
79c0373b32 more pre-commit testing 2015-05-09 13:08:56 -04:00
64bb30bb50 more pre-commit testing 2015-05-09 13:05:07 -04:00
0fe76473fc remove testing file 2015-05-09 11:32:27 -04:00
73802d15a9 more pre-commit testing 2015-05-09 11:32:04 -04:00
10f073e010 more pre-commit testing 2015-05-09 11:29:38 -04:00
f0c32ac496 more pre-commit testing 2015-05-09 02:36:38 -04:00
cec71f1211 more pre-commit testing 2015-05-09 02:23:21 -04:00
b115920c9d more pre-commit testing 2015-05-09 02:23:08 -04:00
e865033e93 more pre-commit testing 2015-05-09 02:19:52 -04:00
741eb8593d more pre-commit testing 2015-05-09 02:18:39 -04:00
2a7f35fa75 more pre-commit testing 2015-05-09 02:18:23 -04:00
06a2ab5045 more pre-commit testing 2015-05-09 02:16:42 -04:00
33d3cd1292 more pre-commit testing 2015-05-09 02:16:17 -04:00
389bdfb6ae more pre-commit testing 2015-05-09 02:14:11 -04:00
43219fe674 more pre-commit testing 2015-05-09 02:13:34 -04:00
aea150a902 more pre-commit testing 2015-05-09 02:12:33 -04:00
806387b484 more pre-commit testing 2015-05-09 02:12:13 -04:00