13
0
Commit Graph

4477 Commits

Author SHA1 Message Date
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
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
fcbb78b010 session prefs editor gets renamed as session properties
git-svn-id: svn://localhost/ardour2/branches/3.0@7223 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 17:09:28 +00:00
dab0dacc66 patch from lincoln to make MIDI track height changes no longer just grow note height, but instead expand the visible note range once notes hit a given height
git-svn-id: svn://localhost/ardour2/branches/3.0@7222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 16:02:49 +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
ce78296f96 move computation of TimeAxisViewItem fixed heights into a static member function and call early in process life, because we need the values in MidiStreamview - fixes a bug with notes not aligning with note lines in a new session
git-svn-id: svn://localhost/ardour2/branches/3.0@7220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:57:31 +00:00
eb37119975 check for gcc 4.5 and prohibit compilation with optimization if found
git-svn-id: svn://localhost/ardour2/branches/3.0@7219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:32:37 +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
9317a32179 fix missing break in options parsing.
git-svn-id: svn://localhost/ardour2/branches/3.0@7210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:40 +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
Torben Hohn
ef505452a2 basic -T <load_template> option
git-svn-id: svn://localhost/ardour2/branches/3.0@7208 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:10 +00:00
816232cd97 zero-pad seconds field of verbose canvas cursor, fixes #3216
git-svn-id: svn://localhost/ardour2/branches/3.0@7206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 13:01:22 +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
c51d6a1582 build fix
git-svn-id: svn://localhost/ardour2/branches/3.0@7198 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:55:30 +00:00
265e26c2db final use of "stop_signal.h" removed
git-svn-id: svn://localhost/ardour2/branches/3.0@7197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 15:49:38 +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