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
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
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
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
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
db1fa42f14
start tracking note overlaps while moving notes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7228 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 21:27:36 +00:00
Torben Hohn
1abbb506b8
move route_graph->rechain( r ); into Session::resort_routes_using
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7227 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:38:01 +00:00
Torben Hohn
932d6c79d0
[3.0P] dont dump chain(1) in session.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7226 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:09:27 +00:00
Torben Hohn
357cf39470
add missing graph.cc and friends :S
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7225 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:09:17 +00:00
Torben Hohn
c59dade835
merge 3.0P into trunk.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7224 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 19:50:22 +00:00
9208598c26
Sequence::contains() and Sequence::overlaps() now use pitch-based indexing to speed things up in pathological cases
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7221 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:58:15 +00:00
b12f624890
modified version of a patch from robin gareus to avoid leaving pointers to data buffers owned by Session as the buffer for a JACK MIDI event. Robin - it would be good if you could test and confirm (email?) that my modified version also works
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7218 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 12:37:32 +00:00
460d2d0675
add channel+pitch indexing for notes in a Sequence
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7217 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 19:55:37 +00:00
baacf1c7b4
forward port ConfigVariable<bool> fix from 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7216 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 19:54:05 +00:00
Torben Hohn
71c876109f
add -P flag to the session command return value.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 16:35:41 +00:00
Torben Hohn
51ad790745
add -P flag blocking port connections while loading session
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 16:21:02 +00:00
Torben Hohn
b65fe35f67
reenable loading of a statefile specified at commandline
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:50 +00:00
Torben Hohn
f27c481af1
add template support to jack-session code. and also generate timestamped name
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:31 +00:00
0cd3bd4f19
rationale pathways that add notes to Sequence<T> so that there is only final insertion step; when changing note properties that affect "indexing" within a Sequence<T> (i.e. via set<T,comparator> indexing/ordering/hashing), remove the note and add it back so that indexing stays consistent; fix marshalling of MidiModel::DiffCommand (boost::bind(&Object::method, reference_to_object) will COPY the reference, so use a pointer); fix MidiModel::find_note() to compare note properties not pointer addresses
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7203 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-01 20:40:45 +00:00
df99f37047
add missing (new) file
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-01 01:22:37 +00:00
db67064296
switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<...,EarlierNoteComparator> for _write_notes, does FIFO note resolution for overlapping notes in SMF file; implement Sequence::overlaps() ... current use is uncertain; ARDOUR::coverage() uses 64bit framepos_t
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 19:47:15 +00:00
a01dc9b6f2
remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 14:21:43 +00:00
9b5f357490
make trimming in region name (colored) highlight work even in internal edit mode; change enter/leave handler to return true by default (MIGHT HAVE UNINTENDED EFFECTS on mouse response), thus avoiding multiple stacked canvas items fighting over enter/leave
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-30 20:13:29 +00:00
60ec5dd339
provide a generalized Sequence::get_notes()-by-predicate method, and prototypes for 2 future methods
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7191 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 21:36:38 +00:00
3d6493abc9
replaced gtk_idle_add() with g_idle_add()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 16:33:18 +00:00
Carl Hetherington
36538ed3df
Take route's processor lock for things called by the process thread. Prevents problems when processors are being reconfigured and a process callback occurs.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7183 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 17:10:08 +00:00
d15082d828
remove commented debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 15:06:39 +00:00
Carl Hetherington
d0d160e566
Fix crash on clear option for automation tracks ( #3195 ). Also fix state change signalling so that lines reappear on undoing a clear.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 12:26:00 +00:00
Carl Hetherington
d47161b9ee
Use bbt_add and bbt_subtract to do proper BBT maths in round_to_beat_subdivision.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 00:26:32 +00:00
Carl Hetherington
102f64f94c
Remove empty MIDI regions which result from recordings made when no MIDI data is received.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7167 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 16:03:47 +00:00
b91e1f3605
generate knob pixbufs at run time but draw from the pixbufs; remove mfimg utility and existing knob icon png files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 15:18:04 +00:00
Carl Hetherington
7b8f584167
Remove some unused methods.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 11:54:25 +00:00
6b19aee3b5
split out sndfile manager code into its own file; move a couple of utility functions into gtkmm2ext ; add knob PNG generating tool ; break appearance of monitor section for now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:45:21 +00:00
Carl Hetherington
943edf1b5d
Use debug macros for SMFSource.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7150 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 22:39:36 +00:00
Carl Hetherington
32d2e2eaac
Preserve source's model on clone() if it is not rebuilt. Should fix #3155 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 21:45:50 +00:00
Carl Hetherington
dd134d8afb
Note the time of the last event that was read by read_unlocked, so that the current time can be reset on a subsequent call.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 15:42:27 +00:00
a196405da9
various minor MIDI fixes: prevent duplicate note entry with mouse, show note info more often with verbose cursor, fix some crashes from click+move on notes ... lots more where this comes from
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 22:38:12 +00:00
Carl Hetherington
84a801a791
A few cleanups and rearrangements in the RC options. Add options for default mute-affects-* settings, and make routes obey them.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7122 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 01:30:35 +00:00
Carl Hetherington
03bed9a8cb
Use SMFSource static method to look for MIDI file extensions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 23:36:18 +00:00
Carl Hetherington
6ad69a206c
When muting a route because another is soloed, take
...
into account the muting options (pre-fader/post-fader etc.)
for the muted route.
git-svn-id: svn://localhost/ardour2/branches/3.0@7119 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 14:32:49 +00:00
