13
0
Commit Graph

4573 Commits

Author SHA1 Message Date
Carl Hetherington
ecb0cd5d11 Make MIDI region `automation' respect the automation mode so that it is
only played back if the automation mode is set to "Play".  Munge AutoState
for AutomationRegionViews so that they reflect their AutomationTimeAxisView's
setting.  Fixes #3135.


git-svn-id: svn://localhost/ardour2/branches/3.0@7304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-25 20:47:09 +00:00
ad81fd40d2 step back JACK dependency to 0.118
git-svn-id: svn://localhost/ardour2/branches/3.0@7303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 22:44:48 +00:00
db55b149eb change the way MIDI note colors are defined (2 3-point color ranges, one for selected, one for unselected); change default scroll action on selected midi notes to "fine" adjustment rather than "coarse" (now alt-scroll)
git-svn-id: svn://localhost/ardour2/branches/3.0@7302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 21:22:00 +00:00
806a22fefe change note colors on the fly, to permit user-definition of colors more easily; remove some debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@7301 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 19:46:28 +00:00
de24d4f8b1 add and use Source::empty() since it can be done more efficiently than length(pos) == 0
git-svn-id: svn://localhost/ardour2/branches/3.0@7300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 18:04:38 +00:00
e72d710734 use condvar and exception-proof mutex for chain swaps in graph
git-svn-id: svn://localhost/ardour2/branches/3.0@7299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 18:04:02 +00:00
59a3dd2383 clear activation_sets component of Graph, thus restoring full Route deletion
git-svn-id: svn://localhost/ardour2/branches/3.0@7298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 16:20:32 +00:00
ea2f5f170b fix math bug with numthreads computation
git-svn-id: svn://localhost/ardour2/branches/3.0@7297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 14:17:09 +00:00
0f5bdd666f use JACK thread creation functions to create process-graph threads; provide GUI control over number of threads-relative-to-number-of-CPUS
git-svn-id: svn://localhost/ardour2/branches/3.0@7296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 14:13:45 +00:00
fe229a830e GUI-created MIDI regions now steal the pending MIDISource from the track's diskstream, to keep numbering sane; don't create any new MIDI regions if capture collected no data (fixes a crash in my previous commit, and is just logically much more sensible
git-svn-id: svn://localhost/ardour2/branches/3.0@7295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 01:37:24 +00:00
Carl Hetherington
d8e93be2ee Tweak some colours as per Chris' suggestions in #3254.
git-svn-id: svn://localhost/ardour2/branches/3.0@7294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 00:00:31 +00:00
f188ffffc1 fix some non-debug compile warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@7293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 21:43:40 +00:00
8db2e27faa use new Source::used() rather than SessionPlaylists::source_use_count() to determine if a file can be removed
git-svn-id: svn://localhost/ardour2/branches/3.0@7292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 21:43:16 +00:00
f4401c5928 midway snapshot of work done on managing Region & Source lifetimes correctly. may fix missing MIDI file bug ; save empty playlists because they may be referred to by the history file ; undo commands auto-delete when objects they refer to die (currently not commands built from XML deserialization); Sources now know how many regions are using them for something, meaning that we know if we can delete the files holding any data for the source
git-svn-id: svn://localhost/ardour2/branches/3.0@7291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 20:14:07 +00:00
Carl Hetherington
cac03dbeb6 Update locations GUI more efficiently by avoiding a rebuild when a location is removed. Fixes #3263.
git-svn-id: svn://localhost/ardour2/branches/3.0@7290 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 01:51:55 +00:00
Carl Hetherington
055f839b1f Trim includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@7289 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 01:50:37 +00:00
Carl Hetherington
f2e48e8e1b Allow range selections to be started in non-region areas. Fixes #3255.
git-svn-id: svn://localhost/ardour2/branches/3.0@7288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-22 01:28:49 +00:00
Carl Hetherington
108f537b69 Stop attempts to connect new MIDI tracks to bad ports when there is no MIDI IOs on the master buss.
git-svn-id: svn://localhost/ardour2/branches/3.0@7287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 23:45:30 +00:00
Carl Hetherington
51270cf148 Coding style.
git-svn-id: svn://localhost/ardour2/branches/3.0@7286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 23:45:15 +00:00
6e138fa068 fix some warnings that come from a non-debug build, some of which are actually errors in handling return values from boost::signal emissions
git-svn-id: svn://localhost/ardour2/branches/3.0@7285 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 15:26:03 +00:00
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