13
0
Commit Graph

4503 Commits

Author SHA1 Message Date
4f16de5cfe GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitespace reformatting for some reason
git-svn-id: svn://localhost/ardour2/branches/3.0@7284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 14:46:17 +00:00
Carl Hetherington
5138cb5d05 Remove unused variable.
git-svn-id: svn://localhost/ardour2/branches/3.0@7283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 01:02:47 +00:00
Carl Hetherington
40ffadf219 Return delta time even for metadata events. Should fix #3244.
git-svn-id: svn://localhost/ardour2/branches/3.0@7282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-20 22:49:35 +00:00
Carl Hetherington
c4e6b368ae When creating notes with the pencil tool, make them 1 frame shorter than the grid subdivision to prevent overlaps. Fixes #3237.
git-svn-id: svn://localhost/ardour2/branches/3.0@7281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-20 21:24:48 +00:00
Carl Hetherington
6c19e1c7ea Invalidate old sources before forgetting about them. I think this prevents the possibility of an old source keeping a lock on the MidiModel via its iterator. May fix #3249.
git-svn-id: svn://localhost/ardour2/branches/3.0@7280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-20 01:33:16 +00:00
aef9d4eaeb use the new left/right trim cursor for the editor summary
git-svn-id: svn://localhost/ardour2/branches/3.0@7279 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 02:15:43 +00:00
Carl Hetherington
5e12dc768d Back to real-time zoom.
git-svn-id: svn://localhost/ardour2/branches/3.0@7278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 02:07:13 +00:00
Carl Hetherington
9c4f5ac000 Remove unnecessary height changed notification for streamviews, now that the summary doesn't need to know.
git-svn-id: svn://localhost/ardour2/branches/3.0@7277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 02:06:58 +00:00
Carl Hetherington
a8e019c9e0 Fix restore of track visibility from state files (#3245)
git-svn-id: svn://localhost/ardour2/branches/3.0@7276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 00:54:18 +00:00
Carl Hetherington
a54f107d4f Make summary zoom happen based on where the drag is started, rather than
needing a modifier.  Change mouse pointer shape in the summary to indicate
what will happen on a drag.  Allow vertical zoom in the summary, which modifies
track heights accordingly.


git-svn-id: svn://localhost/ardour2/branches/3.0@7275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-18 00:05:44 +00:00
6a634b9c72 2nd fix for hot spots for fade in/out cursors
git-svn-id: svn://localhost/ardour2/branches/3.0@7274 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:40:51 +00:00
382bda557a fix hot spots for fade in/out cursors
git-svn-id: svn://localhost/ardour2/branches/3.0@7273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:28:30 +00:00
3a048e1d6c new fade in/fade out colors from chrisg
git-svn-id: svn://localhost/ardour2/branches/3.0@7272 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:20:37 +00:00
1ee298a235 new fade in/out handle cursors from chrisg (maybe to be improved); show MIDI note velocities; try to show note length while dragging notes (in progress); some debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@7271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:09:07 +00:00
fe85a922ec new trim cursors from chrisg, fix up hotspots for said cursors, make Editor cursors public; note draw mode now trims existing notes (but without trim cursor :(
git-svn-id: svn://localhost/ardour2/branches/3.0@7270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 15:06:30 +00:00
ac9589ff2c use image cursors for left/right trim cursors
git-svn-id: svn://localhost/ardour2/branches/3.0@7269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 13:35:42 +00:00
7e3ebe1267 add left/right side trim cursors and use them for region trimming, as appropriate
git-svn-id: svn://localhost/ardour2/branches/3.0@7268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 12:45:51 +00:00
Carl Hetherington
6abb75797f Make summary arrow buttons auto-repeat.
git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 00:02:45 +00:00
2e644fe91f prevent removal of master/monitor busses without explicit (and hard to set) approval
git-svn-id: svn://localhost/ardour2/branches/3.0@7265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 16:59:20 +00:00
a668964d5c avoid needless errors when redoing an operation involving adding notes that were not added because of overlap exclusion preferences
git-svn-id: svn://localhost/ardour2/branches/3.0@7264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 16:58:50 +00:00
Carl Hetherington
bb34b15944 Stop summary showing hidden tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@7260 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-15 23:43:51 +00:00
Carl Hetherington
db98653d20 Hopefully fix slight vertical movements on attempts to drag horizontally.
git-svn-id: svn://localhost/ardour2/branches/3.0@7259 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-15 23:36:40 +00:00
Carl Hetherington
e1a63db0db Plot tracks at a constant height in the summary.
git-svn-id: svn://localhost/ardour2/branches/3.0@7258 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-15 17:37:44 +00:00
Carl Hetherington
1f829f45ef Summary tweaks: plot tracks as well as regions (as suggested by Chris);
remove the restriction on maximum track height; represent empty editor
space in the summary.


git-svn-id: svn://localhost/ardour2/branches/3.0@7257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-14 23:59:21 +00:00
c158c44fab make note overlap resolution store side effects in a DiffCommand, and add its changes to the DiffCommand being executed, so as to retain "internal" note property changes across undo
git-svn-id: svn://localhost/ardour2/branches/3.0@7256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-14 23:43:10 +00:00
f1fc47b077 MTC drift patch from robin gareus, plus two related cleanups to the tracer & debug messages
git-svn-id: svn://localhost/ardour2/branches/3.0@7255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-12 16:11:33 +00:00
fddb377812 introduce the notion that note additions and property changes can cause the removal of other notes because of overlaps; merge Diff and Delta commands in MidiModel; fix marshalling of notes to avoid float->int conversion of length+time properties; initial implementation (not tested much so far) of different policies for how to handle note overlaps
git-svn-id: svn://localhost/ardour2/branches/3.0@7254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-12 13:55:22 +00:00
Carl Hetherington
fc611af4b4 Ignore core files.
git-svn-id: svn://localhost/ardour2/branches/3.0@7253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-11 00:31:40 +00:00
Carl Hetherington
b23861609e Preserve region state as well as playlist state in undo of bounce range. Fixes #3234.
git-svn-id: svn://localhost/ardour2/branches/3.0@7252 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-10 22:56:46 +00:00
Carl Hetherington
07500f2250 Fix warning.
git-svn-id: svn://localhost/ardour2/branches/3.0@7251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 22:37:31 +00:00
14004b75a6 dynamic playback & capture buffer resizing (though transport is stopped first)
git-svn-id: svn://localhost/ardour2/branches/3.0@7250 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 17:24:07 +00:00
01829e6338 GUI control of playback & buffer sizes, but not dynamic (i.e. requires a restart)
git-svn-id: svn://localhost/ardour2/branches/3.0@7249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 15:02:18 +00:00
2b9dc7b380 permit different sizes for audio playback & capture buffers
git-svn-id: svn://localhost/ardour2/branches/3.0@7248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 14:11:46 +00:00
1e728e728a basically, fix all kinds of odds and ends with MIDI playback, including missed notes and applying gain
git-svn-id: svn://localhost/ardour2/branches/3.0@7247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 13:00:54 +00:00
Carl Hetherington
8f263c239a Clean up a bit. Fix non-relative note dragging mode to fit my understanding of its correct behaviour. Fixes #3189.
git-svn-id: svn://localhost/ardour2/branches/3.0@7246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 23:45:58 +00:00
Carl Hetherington
8dd31447be Fix handling of the mapping between parameters and automation CheckMenuItems. Should fix #3206, #3215 and the remainder of #3228.
git-svn-id: svn://localhost/ardour2/branches/3.0@7245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 21:48:38 +00:00
Carl Hetherington
2067937ecf Copy-edit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:30:03 +00:00
Carl Hetherington
d5e5de5aaf Reduce default summary size and remember it across saves. Fixes #3205.
git-svn-id: svn://localhost/ardour2/branches/3.0@7243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:29:33 +00:00
Carl Hetherington
5fd862ebc5 Small cleanup.
git-svn-id: svn://localhost/ardour2/branches/3.0@7242 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:21:24 +00:00
Carl Hetherington
e67a6d8989 Update ring buffer read pointer correctly in case of a failure to insert an event into the MidiBuffer.
git-svn-id: svn://localhost/ardour2/branches/3.0@7241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:21:01 +00:00
Carl Hetherington
e6becb3425 Better-define behaviour when relayering a playlist with a single zero-length region. Fixes #3144.
git-svn-id: svn://localhost/ardour2/branches/3.0@7238 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-07 12:44:15 +00:00
Carl Hetherington
9510cb20fc Lincoln's patch from #3223 to add show/hide midi track options to the route list.
git-svn-id: svn://localhost/ardour2/branches/3.0@7237 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-06 00:56:19 +00:00
Carl Hetherington
17bb05a7c0 Lincoln's patch from #3224 to colour midi stream view backgrounds properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@7236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-06 00:56:05 +00:00
Carl Hetherington
e002e5cea1 Lincoln's patch from #3225 to tweak crossfade rendering.
git-svn-id: svn://localhost/ardour2/branches/3.0@7235 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-06 00:55:53 +00:00
Carl Hetherington
4065c59ed0 Fix signedness error.
git-svn-id: svn://localhost/ardour2/branches/3.0@7234 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-06 00:31:29 +00:00
5f1e6f089f more style-guidification
git-svn-id: svn://localhost/ardour2/branches/3.0@7233 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:11:18 +00:00
15f1d68e9f more style-guidification, plus do not run process threads RT if JACK is not RT
git-svn-id: svn://localhost/ardour2/branches/3.0@7232 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:09:09 +00:00
04a10a9700 style-guide-ification
git-svn-id: svn://localhost/ardour2/branches/3.0@7231 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:03:14 +00:00
ea39189938 style-guide-ification
git-svn-id: svn://localhost/ardour2/branches/3.0@7230 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:02:00 +00:00
4d828729cd add DEBUG::ProcessThreads as a debug tag for parallelization (probably to be renamed)
git-svn-id: svn://localhost/ardour2/branches/3.0@7229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 21:28:02 +00:00