13
0
Commit Graph

312 Commits

Author SHA1 Message Date
Carl Hetherington
3b5f017eb9 Add missing break; (#4820).
git-svn-id: svn://localhost/ardour2/branches/3.0@11810 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-07 01:57:11 +00:00
Carl Hetherington
3120bae8b4 Don't leave internal edit mode when clicking on an automation region view (#4747).
git-svn-id: svn://localhost/ardour2/branches/3.0@11749 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-22 16:41:23 +00:00
Carl Hetherington
e9bf20021e Remove unused RegionGainDrag; fix logic in adding new
region gain points; remove unreached switch {} that may
have come from a mis-merge.


git-svn-id: svn://localhost/ardour2/branches/3.0@11631 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 20:47:40 +00:00
c52c2b7368 forward-port some fixes from a2
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 17:15:25 +00:00
671ec99bac (1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level
git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-13 14:34:21 +00:00
d73815ccf2 range mode should not allow trim of MIDI notes
git-svn-id: svn://localhost/ardour2/branches/3.0@11471 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-08 12:52:04 +00:00
53cb1b6572 mouse draw mode can draw AND select (and trim) notes (but trim cursors don't appear yet)
git-svn-id: svn://localhost/ardour2/branches/3.0@11470 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-08 12:50:32 +00:00
b3652ddc3d fix for #4689 from dave flick
git-svn-id: svn://localhost/ardour2/branches/3.0@11467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 17:51:50 +00:00
c21c9e6662 use button joiner for smart mode; polish up the visuals on the joiner a bit
git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 18:31:10 +00:00
7629120cda many changes, large and small, related to smart mode editing, range/region selection, and behaviour of playhead when always-play-range is enabled. could be buggy, but probably in subtle (or even very subtle) ways rather than obvious
git-svn-id: svn://localhost/ardour2/branches/3.0@11394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 22:53:22 +00:00
0740fab6ed leave note edit mode with a click on any track background, not just non-midi
git-svn-id: svn://localhost/ardour2/branches/3.0@11349 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 19:38:14 +00:00
34581e4de9 fix breakage of normal method of creating an empty MIDI region
git-svn-id: svn://localhost/ardour2/branches/3.0@11341 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:17:24 +00:00
f3624c1874 exit internal/note edit mode when clicking on anything that is not a MIDI region view or a note (or various modeless items like markers and the playhead)
git-svn-id: svn://localhost/ardour2/branches/3.0@11333 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:20:31 +00:00
efab36a85e new mouse mode (Draw (notes)); switch into internal mode when draw is selected; notably improve use of dbl-click to enter and exist internal/note edit mode
git-svn-id: svn://localhost/ardour2/branches/3.0@11269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 15:23:51 +00:00
c43f1d22c8 enter and exit node edit mode with dbl-click in any MIDI region
git-svn-id: svn://localhost/ardour2/branches/3.0@11268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 00:14:58 +00:00
7856f14c44 when a context click event occurs in the editor, store the event so we can use it to determine position later during its handling, if necessary
git-svn-id: svn://localhost/ardour2/branches/3.0@11081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 23:18:24 +00:00
Carl Hetherington
60fa99a34d Remove hopelessly inadequate attempt at last_item_entered
and ask the canvas where we are instead.  Should fix #4532.


git-svn-id: svn://localhost/ardour2/branches/3.0@10907 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-05 20:47:53 +00:00
Carl Hetherington
ec90b0ceb0 Use a Drag class for midi note selection, so that it
gets autoscroll (#4474).


git-svn-id: svn://localhost/ardour2/branches/3.0@10650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 20:11:33 +00:00
Carl Hetherington
28123e436d Snap new automation points on audio lanes (part of #4297).
git-svn-id: svn://localhost/ardour2/branches/3.0@10570 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 16:28:20 +00:00
6449c2e5c8 more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 15:25:01 +00:00
Carl Hetherington
c0b59854ff Trim includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@10357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-31 21:16:32 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
Carl Hetherington
632c4ab264 Don't allow non-movable meter / tempo markers to be
dragged (part of #4313).


git-svn-id: svn://localhost/ardour2/branches/3.0@10067 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-08 17:49:36 +00:00
Carl Hetherington
3ba6804f27 Don't create new regions on clicks on MIDI plugin automation
tracks (#4298).


git-svn-id: svn://localhost/ardour2/branches/3.0@10062 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-07 13:45:52 +00:00
Carl Hetherington
982bfd08db Add context menu for control points.
git-svn-id: svn://localhost/ardour2/branches/3.0@9890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 20:10:31 +00:00
Carl Hetherington
82ec615da3 Make MIDI automation tracks behave the same as MIDI
tracks when they are clicked in an area with no region
(approximation to a fix for #4155).


git-svn-id: svn://localhost/ardour2/branches/3.0@9860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-13 12:34:11 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
d4d5b30aeb remove unused and useless "src" argument for a number of Region property modifying methods
git-svn-id: svn://localhost/ardour2/branches/3.0@9632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-30 13:54:44 +00:00
Carl Hetherington
29ee63707f Fix crash when clicking on a hit (may be #4036).
git-svn-id: svn://localhost/ardour2/branches/3.0@9491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-11 11:55:36 +00:00
Carl Hetherington
988348185e Separate verbose cursor out into its own class and clean up the API. Fixes #4010.
git-svn-id: svn://localhost/ardour2/branches/3.0@9455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 13:38:16 +00:00
Carl Hetherington
8ca87df015 Fix subtraction of bar/beat/tick for verbose canvas cursor (#4011).
git-svn-id: svn://localhost/ardour2/branches/3.0@9426 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-25 21:19:25 +00:00
Carl Hetherington
33cd347529 Fix crash due to _over_region_trim_target not being updated when a RegionView disappears (#3956).
git-svn-id: svn://localhost/ardour2/branches/3.0@9332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-07 23:14:04 +00:00
Carl Hetherington
ad942b104a Prevent region drags with the middle button in internal edit mode (#3869).
git-svn-id: svn://localhost/ardour2/branches/3.0@9199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-24 11:48:12 +00:00
4f84a6cd1d remove spurious debug line
git-svn-id: svn://localhost/ardour2/branches/3.0@9105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-08 14:45:51 +00:00
07e607ebad reinstate (de)selection operations that should happen on mouse button release
git-svn-id: svn://localhost/ardour2/branches/3.0@9104 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-08 12:45:23 +00:00
b88c773894 when leaving internal edit mode, if the current mode is range ("draw") and it wasn't before we entered internal edit mode, flip back to whatever it was before we entered
git-svn-id: svn://localhost/ardour2/branches/3.0@9102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-08 01:55:50 +00:00
f649d775bc prevent trim cursors appearing, and prevent note trimming, when in a MIDI note that is too small on-screen. avoids silliness with trim cursors appearing while drawing small notes on screen, though really, it would nice to avoid them appearing ever in a note that was just added. not sure how to do that.
git-svn-id: svn://localhost/ardour2/branches/3.0@9077 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-05 23:00:49 +00:00
d08e3b94c5 basic adoption of new mouse binding facility
git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-04 03:10:48 +00:00
2c72f58aa1 experiment with making MIDI region boxes vanish when in note/internal edit mode ... to be continued
git-svn-id: svn://localhost/ardour2/branches/3.0@9054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 14:51:02 +00:00
Carl Hetherington
292cda7865 No-op: coding style.
git-svn-id: svn://localhost/ardour2/branches/3.0@9036 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-02 17:00:54 +00:00
Carl Hetherington
0d61f205ab Bring up the click tab of the RC options window when right-clicking on the click button (#3783).
git-svn-id: svn://localhost/ardour2/branches/3.0@8889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 18:53:31 +00:00
7a5b6a5031 patches from lincoln to speed up the regionlist and provide region removal (causes dangling shared ptrs to regions, fix to come
git-svn-id: svn://localhost/ardour2/branches/3.0@8845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-14 21:49:43 +00:00
44f99e9217 make name-highlight bar active for trims even in internal edit mode, again
git-svn-id: svn://localhost/ardour2/branches/3.0@8800 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-09 14:02:49 +00:00
Carl Hetherington
ce91b0953b Remove always-true should_show_selection code.
git-svn-id: svn://localhost/ardour2/branches/3.0@8769 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 14:08:05 +00:00
Carl Hetherington
49869c98f3 Prevent various things from stopping the transport by requesting a transport speed of exactly 0 when they are really just continuously varying it. Fixes strange playhead behaviour during varispeed when the user varispeeds to exactly 0 and auto-return is triggered.
git-svn-id: svn://localhost/ardour2/branches/3.0@8733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 01:12:47 +00:00
15b5fce904 merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 01:31:03 +00:00
Carl Hetherington
1e8586742e Fix session range location by hooking into the undo system. Fixes #3654.
git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 17:38:56 +00:00
f09524b9d3 move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 20:28:37 +00:00
4b861e6039 Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 18:13:37 +00:00
0a19ce6f1c fix crash when dragging percussive-mode notes due to a bad dynamic cast
git-svn-id: svn://localhost/ardour2/branches/3.0@8205 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-07 14:45:24 +00:00