13
0
Commit Graph

3764 Commits

Author SHA1 Message Date
Carl Hetherington
279d0ff34b Remove unused variables.
git-svn-id: svn://localhost/ardour2/branches/3.0@11135 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 14:32:07 +00:00
Carl Hetherington
c9ed7d2402 Fix test build.
git-svn-id: svn://localhost/ardour2/branches/3.0@11134 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 14:32:01 +00:00
Carl Hetherington
c252d65f56 Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
messages read the right way round.


git-svn-id: svn://localhost/ardour2/branches/3.0@11133 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 14:31:55 +00:00
Carl Hetherington
8be724db1b Use the correct flag for DAZ and default to using FTZ and DAZ denormal protection.
git-svn-id: svn://localhost/ardour2/branches/3.0@11132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-02 23:52:28 +00:00
f135947606 intermediate commit as all tempo/meter stuff starts to walk the precompute Bars|Beats list. Still have ::round_to_beat_subdivision() to fix. haven't really done any thorough testing at this point, but basic stuff seems OK
git-svn-id: svn://localhost/ardour2/branches/3.0@11131 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-02 23:32:33 +00:00
69c7dac1a1 new approach to tempo/meter: compute and store the entire map (every bar|beat point), thus enabling us to use the same computation to set the BBT points AND the metric markers (tempo + meter) on the audio timeline. It is known that snapping to the BBT grid doesn't work correctly right now, but this probably caused by the separate code in TempoMap::round_to_type() and i'll dig into that tomorrow. Note that the Bar|beat point list is evaluated "lazily" - we'll never store more than anyone actually needs to display or know, other than 1 minute's worth starting from frame zero
git-svn-id: svn://localhost/ardour2/branches/3.0@11129 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-02 04:04:14 +00:00
Carl Hetherington
6c0224c987 Emit notify_layering_changed() more often; especially when we remove the only region on a top layer, and the StreamView needs to sort itself out.
git-svn-id: svn://localhost/ardour2/branches/3.0@11126 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-31 13:25:50 +00:00
Carl Hetherington
9c8a27c664 Don't round control list events when x-scaling them; prevents large loss of accuracy with xfades when they are scaled to be small and then expanded again (#4602).
git-svn-id: svn://localhost/ardour2/branches/3.0@11125 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-31 13:25:29 +00:00
Carl Hetherington
b93254f275 Anywhere that deletes regions needs to use a rdiff() on the playlist
for the undo history, so that changes to regions' layering_index
get stored in the undo record.  Make Playlist::update use add_region_internal
so that undone regions don't have their layering_index corrupted.
Setup layering indices on relayer() so that deletion of regions
causes an update.


git-svn-id: svn://localhost/ardour2/branches/3.0@11123 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 23:41:17 +00:00
Carl Hetherington
0be530821c Debug code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11122 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 23:41:11 +00:00
Carl Hetherington
dd53e7284a Set up layering_index immediately on an explicit layer, so that undo
works properly.  Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().


git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 20:05:48 +00:00
Carl Hetherington
2c23ff8ceb Add assert.
git-svn-id: svn://localhost/ardour2/branches/3.0@11119 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 20:05:40 +00:00
21d4eb56d4 fix default response behaviour of Gtkmm2ext::Prompter (from colinf)
git-svn-id: svn://localhost/ardour2/branches/3.0@11112 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 01:41:21 +00:00
Carl Hetherington
b177514930 Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.
git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 22:14:15 +00:00
cabb76cce6 clean up comments and commented code
git-svn-id: svn://localhost/ardour2/branches/3.0@11110 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 21:40:20 +00:00
07750ccb32 next iteration of tempo map stuff - fixes off-by-one issues with bar offset<->beat math
git-svn-id: svn://localhost/ardour2/branches/3.0@11109 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 21:34:46 +00:00
a85e0b0a2e a huge set of changes to tempo+meter handling. testing feedback requested. the_CLA, you know who i mean :)
git-svn-id: svn://localhost/ardour2/branches/3.0@11103 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 21:02:31 +00:00
c3a52084f8 new DEBUG_ENABLED(bits) macro, potentially useful here and there
git-svn-id: svn://localhost/ardour2/branches/3.0@11102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 21:01:52 +00:00
Carl Hetherington
0d46ad4ca5 Remove unused variable.
git-svn-id: svn://localhost/ardour2/branches/3.0@11101 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-28 18:55:25 +00:00
Carl Hetherington
f440f91849 Try to make new layering stuff play nicely with undo.
git-svn-id: svn://localhost/ardour2/branches/3.0@11097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 20:21:00 +00:00
Carl Hetherington
86cb9348e8 Hack around one case where satisfying all constraints in a
relayer is impossible.


git-svn-id: svn://localhost/ardour2/branches/3.0@11096 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 19:10:31 +00:00
Carl Hetherington
78c4324026 More debugging.
git-svn-id: svn://localhost/ardour2/branches/3.0@11095 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 18:34:05 +00:00
Carl Hetherington
1ac41882d3 Improve debug slightly and fix raise/lower.
git-svn-id: svn://localhost/ardour2/branches/3.0@11094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 18:33:59 +00:00
Carl Hetherington
2db69318ce Fix up confusion with relayering after movement drags in
overlaid mode.


git-svn-id: svn://localhost/ardour2/branches/3.0@11092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 18:33:49 +00:00
Carl Hetherington
8f46200449 Basic DEBUG_TRACE for layering code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11091 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 16:29:40 +00:00
Carl Hetherington
6304261b98 Re-work layering in possibly debatable ways. Sketchy docs in doc/layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 01:42:49 +00:00
Carl Hetherington
0082e3364f Remove some wrongly commited stuff. Sorry\!
git-svn-id: svn://localhost/ardour2/branches/3.0@11087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 00:57:20 +00:00
Carl Hetherington
dfc3078013 Add configure option to raise a FP exception when a denormal
is detected.


git-svn-id: svn://localhost/ardour2/branches/3.0@11086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 00:48:31 +00:00
Carl Hetherington
d771ca6b0e Move patch changes when inserting silence at the start of a model.
git-svn-id: svn://localhost/ardour2/branches/3.0@11084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-27 00:22:21 +00:00
a556546291 explain MXCSR shenanigans in libs/pbd/fpu.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@11079 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 22:32:21 +00:00
5f88b44245 (1) do not write sequential same-value automation data into a ControlList (2) thin AutomationList data when reloading from disk (similar code as Ben's from ardour 2.X, but without user-adjustable thinning density at present). Should fix #4583 and maybe others caused by NaN's occuring from zero-slope lines
git-svn-id: svn://localhost/ardour2/branches/3.0@11078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 22:13:54 +00:00
Carl Hetherington
773d20f330 Fix warnings during test runs.
git-svn-id: svn://localhost/ardour2/branches/3.0@11077 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 19:01:57 +00:00
Carl Hetherington
0fb091dc20 Clean up session after test.
git-svn-id: svn://localhost/ardour2/branches/3.0@11076 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 17:51:03 +00:00
Carl Hetherington
d95f6c7538 Remove unused method.
git-svn-id: svn://localhost/ardour2/branches/3.0@11075 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 17:50:53 +00:00
5558b3cf06 a grab bag of changes correcting and improving the way MIDI note on/off tracking is done. may/should fix a number of problem with spurious note-offs under a variety of circumstances
git-svn-id: svn://localhost/ardour2/branches/3.0@11074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 17:01:31 +00:00
Carl Hetherington
bda0f938fb Tidy up monitoring slightly so that it matches oofus' truth
table for the various different states.  Should fix #4533.


git-svn-id: svn://localhost/ardour2/branches/3.0@11073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 15:37:14 +00:00
Carl Hetherington
0dbc0429a8 Comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@11070 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 12:50:24 +00:00
ddb1f52352 remove overly-floodish debug message from MidiTrackers trace
git-svn-id: svn://localhost/ardour2/branches/3.0@11068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 19:20:52 +00:00
Carl Hetherington
2858e239f4 Rename a few bits and fix a undeclared method.
git-svn-id: svn://localhost/ardour2/branches/3.0@11066 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 01:38:38 +00:00
Carl Hetherington
b7688699ef Remove unused declaration.
git-svn-id: svn://localhost/ardour2/branches/3.0@11065 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 01:38:32 +00:00
Carl Hetherington
d8a9f64bbc Clarify ensure vs. request for JACK monitoring, naming-wise.
git-svn-id: svn://localhost/ardour2/branches/3.0@11064 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 01:11:46 +00:00
Carl Hetherington
15aa81fe70 Match request in function names to the eventual call to jack_port_request_monitor.
git-svn-id: svn://localhost/ardour2/branches/3.0@11063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 01:11:41 +00:00
Carl Hetherington
d26260f51d Do some renaming in the ARDOUR::Port class tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@11062 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-23 00:26:25 +00:00
Carl Hetherington
66532c0519 Remove unused header.
git-svn-id: svn://localhost/ardour2/branches/3.0@11061 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 23:50:08 +00:00
Carl Hetherington
74df4e2d91 Remove unused declaration.
git-svn-id: svn://localhost/ardour2/branches/3.0@11060 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 23:41:59 +00:00
d2dd80807c more tempo-related AU changes
git-svn-id: svn://localhost/ardour2/branches/3.0@11059 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 21:07:04 +00:00
ceaf76b505 switch over audio_unit.cc to use divisions_per_bar() not beats_per_bar(). not sure how this was missed
git-svn-id: svn://localhost/ardour2/branches/3.0@11058 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 20:48:37 +00:00
ed2beaffee main fix: when transport stops, clear per-region per-playlist note trackers even if there is no capture data to process; side effects: remove unused MidiBuffer::merge() and add DEBUG::MidiTrackers as well as more and better MIDI debug tracing facilities
git-svn-id: svn://localhost/ardour2/branches/3.0@11057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 20:14:47 +00:00
2449a787c5 fix a build issue in Evoral that was preventing Sequencer<T>::dump() from being available, and expose operator<< for Sequence<T>
git-svn-id: svn://localhost/ardour2/branches/3.0@11054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-22 02:09:39 +00:00
8ab4703173 remove extraneous debugging output from MidiBuffer::merge_in_place()
git-svn-id: svn://localhost/ardour2/branches/3.0@11053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 19:56:40 +00:00
642ab99db8 reorganize MidiBuffer::merge_in_place() to cover the cases i wasn't thinking about and be more logical to anyone else
git-svn-id: svn://localhost/ardour2/branches/3.0@11052 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 19:33:41 +00:00
302ac289ba likely fix for crash in MidiBuffer::merge_in_place() due to unwarranted assumption in the code
git-svn-id: svn://localhost/ardour2/branches/3.0@11051 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 18:10:58 +00:00
8d05ed8e8a merge-in-place debugging (to be removed later)
git-svn-id: svn://localhost/ardour2/branches/3.0@11050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 17:30:08 +00:00
5d509146c8 followup to the previous tempo-dragging commit: use argument to Drag::aborted() to know if we moved; update the frame position of tempo map metrics when we remove a tempo mark (should fix visual glitches when dragging tempo)
git-svn-id: svn://localhost/ardour2/branches/3.0@11049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 14:21:05 +00:00
24a29f61d9 provide config parameter to allow non-quarter note pulses; off by default; no GUI to reset it at this point
git-svn-id: svn://localhost/ardour2/branches/3.0@11046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:33:38 +00:00
Carl Hetherington
7dffe671da Now that notify_length_changed() just calls
ContentsChanged, its callers can be removed or changed
to just notify_contents_changed.


git-svn-id: svn://localhost/ardour2/branches/3.0@11024 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 02:03:44 +00:00
Carl Hetherington
3c8786f45b Remove LengthChanged that no-one was listening to.
git-svn-id: svn://localhost/ardour2/branches/3.0@11023 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 02:03:38 +00:00
e9b4f14668 rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The number doesn't describe the smallest division of a "beat" (which is only defined contextually anyway), but rather the smallest division of the the divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and we can divide each one into ticks_per_bar_division pieces; in a separate meter (section) of 3/8, there are 3 divisions per bar, each of which can be divided into ticks_per_bar_division_pieces.
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 19:44:43 +00:00
71bba8053e fix a number of errors with BBT time computations, mostly notably ones related to tempo-only change
git-svn-id: svn://localhost/ardour2/branches/3.0@11020 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 18:32:06 +00:00
Carl Hetherington
f97091105d Remove unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 18:46:54 +00:00
Carl Hetherington
39f765614a Clear up confusion with overloads of _frozen and frozen()
meaning different things.


git-svn-id: svn://localhost/ardour2/branches/3.0@11016 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 16:37:18 +00:00
Carl Hetherington
85b75a0ab1 Remove unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@11015 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 02:05:04 +00:00
Carl Hetherington
6c575f1385 Make a fair bit of Region's interface private.
git-svn-id: svn://localhost/ardour2/branches/3.0@11014 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 02:04:58 +00:00
3d859a5ac6 update position of tempo map metrics when a meter marker is removed
git-svn-id: svn://localhost/ardour2/branches/3.0@11013 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-16 15:58:39 +00:00
Carl Hetherington
5f4a276ad0 Add warning if a duplicate Linux VST plugin is rejected.
git-svn-id: svn://localhost/ardour2/branches/3.0@11012 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 22:27:15 +00:00
Carl Hetherington
084cd5ffda Add basic test of playlist layering.
git-svn-id: svn://localhost/ardour2/branches/3.0@11011 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 14:33:20 +00:00
96585e532c send sustain=off and all-notes-off when a MIDI track is muted (may fix #4295)
git-svn-id: svn://localhost/ardour2/branches/3.0@11005 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-14 17:17:30 +00:00
60872a8504 get Delivery to disconnect from any signals it is connected to relatively early in its destructor, so that it is not possible to call Delivery::cycle_start() and encounter a partially formed Delivery-derived object. may fix a crash that geoff beasley has seen with jack2
git-svn-id: svn://localhost/ardour2/branches/3.0@11004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-14 17:08:57 +00:00
dcccd5b4d6 patch from roy vegard to stop feedback from causing jumps when a MIDI controller and ardour are out of sync
git-svn-id: svn://localhost/ardour2/branches/3.0@11001 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-14 15:57:48 +00:00
88d49cdb57 fix up mess with unassigned Playlist::orig_track_id
git-svn-id: svn://localhost/ardour2/branches/3.0@10998 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 16:52:33 +00:00
Carl Hetherington
9f897d097a Remove meter from beats calculations now that it is no
longer important.


git-svn-id: svn://localhost/ardour2/branches/3.0@10997 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 11:05:52 +00:00
08c7f0b2bc fix up XML property name for Meter::beats_per_bar (w/backward compat)
git-svn-id: svn://localhost/ardour2/branches/3.0@10996 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 02:53:14 +00:00
e0cf3b6354 more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 02:46:36 +00:00
Carl Hetherington
56c33f0202 Always set up _last_position on set_position_internal so that the playlist range movement code doesn't get confused when we have region move notifications where the region doesn't actually move (should fix #4557).
git-svn-id: svn://localhost/ardour2/branches/3.0@10992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 23:39:09 +00:00
4a0c798242 fundamentally alter how we compute frames_per_beat(). this follows much discussion on IRC. fundamentally, tempo and ONLY tempo affects the computation of frames_per_beat(), meter has no effect at all. However, following typical DAW conventions, we continue to want the "grid" to show metric divisions, not fixed beats, so add a new method (Meter::frames_per_division()) that retains the old math which takes meter into account. This commit will alter the behaviour of MIDI notes in any session with multiple time signatures. They will likely break. Unfortunately, there is no alternative to this breakage at this time.
git-svn-id: svn://localhost/ardour2/branches/3.0@10988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 14:00:44 +00:00
Carl Hetherington
a107b95307 Set up region BBT time when frame position changes, if the region is glued to BBT; fixes part of #4257.
git-svn-id: svn://localhost/ardour2/branches/3.0@10986 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 02:50:47 +00:00
Carl Hetherington
748b24009b Similar hacks to framepos_minus_beats to handle -ve
positions as were appled to framepos_plus_beats.


git-svn-id: svn://localhost/ardour2/branches/3.0@10984 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 21:14:35 +00:00
Carl Hetherington
73a91402cd Save templates as directories with plugin state, if
there is any, and copy that state to sessions created
from those templates.  Should fix #4525.  Breaks
existing session templates, sorry; they can be fixed by
moving the .template file into a new directory with the
name of the template (minus the .template).


git-svn-id: svn://localhost/ardour2/branches/3.0@10982 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:38:42 +00:00
Carl Hetherington
a03f3229f4 Minor fix to error message.
git-svn-id: svn://localhost/ardour2/branches/3.0@10981 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:38:31 +00:00
Carl Hetherington
b5478a8a2b Clarify stop-at-session-end behaviour; should fix #4033.
git-svn-id: svn://localhost/ardour2/branches/3.0@10978 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 16:26:03 +00:00
Carl Hetherington
1bbe08af1a Keep track of MIDI region's start positions in beats, to
match the source, so that starts are not corrupted when
tempos change (#4494).


git-svn-id: svn://localhost/ardour2/branches/3.0@10976 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:50:36 +00:00
Carl Hetherington
ed360080d0 Sessions loaded from 2.X don't have a diskstream (yet)
in Track::set_state(); prevent a crash, at least; not
100% sure if the behaviour is right, though.


git-svn-id: svn://localhost/ardour2/branches/3.0@10975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:14:17 +00:00
Carl Hetherington
e3b4fa678d Fix framewalk_to_beats when it traverses more than one
metric change.


git-svn-id: svn://localhost/ardour2/branches/3.0@10970 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 20:23:59 +00:00
d23a6de077 fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id()
git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 19:20:15 +00:00
Carl Hetherington
6e211e27e2 Slightly simpler implementation of framewalk_to_beats.
git-svn-id: svn://localhost/ardour2/branches/3.0@10967 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 16:06:29 +00:00
Carl Hetherington
6b27595c4e Comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@10966 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 15:08:13 +00:00
Carl Hetherington
5344f5ca0f Don't try to process_input() if an IO has no ports; fixes
#4546.


git-svn-id: svn://localhost/ardour2/branches/3.0@10965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 14:03:37 +00:00
Carl Hetherington
e02e25e3f3 Add fixed-up framepos_plus_beats() and use it for the BeatsFramesConverter, since it only ever passed in beats to framepos_plus_bbt anyway.
git-svn-id: svn://localhost/ardour2/branches/3.0@10964 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 13:49:08 +00:00
Carl Hetherington
2a9ceb74c4 Compute delta time correctly when appending events; the converter must be used to convert a source time, not a delta time, otherwise tempo / meter changes are not correctly accounted for.
git-svn-id: svn://localhost/ardour2/branches/3.0@10963 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 13:48:50 +00:00
Carl Hetherington
8135a0c5ec Clean up test slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@10957 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 22:57:45 +00:00
Carl Hetherington
6af96fd59d Fix framewalk_to_beats with non-beat-aligned starting positions.
git-svn-id: svn://localhost/ardour2/branches/3.0@10956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 22:53:50 +00:00
Carl Hetherington
73461494d7 Add simple framewalk_to_beats test and normalise naming
of test files.


git-svn-id: svn://localhost/ardour2/branches/3.0@10954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:59:23 +00:00
f9c15b6136 Support new URIs for LV2 presets.
Old stuff continues to work for Calf, but it'd sure be nice if it would be updated...


git-svn-id: svn://localhost/ardour2/branches/3.0@10952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:42:32 +00:00
7adac311b4 Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@10951 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:36:20 +00:00
Carl Hetherington
067b81d0bf Remove unnecessary silencing of unused plugin inputs; unnecessary as (LADSPA/LV2 at least) connect_and_run routines pass in silent buffers for inputs that are not in the ChanMapping. The explicit silencing also failed if the plugin had more inputs than any processor on the route (fixes #4535).
git-svn-id: svn://localhost/ardour2/branches/3.0@10949 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 17:57:50 +00:00
Carl Hetherington
bbf028880f Re-add erroneously-removed configure_io method.
git-svn-id: svn://localhost/ardour2/branches/3.0@10944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 14:10:33 +00:00
86ac8536d2 centralize legal-session-name-checkng and include : and ; in characters that we disallow, because they conflict with search path conventions on *nix and windows
git-svn-id: svn://localhost/ardour2/branches/3.0@10943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 03:06:58 +00:00
Carl Hetherington
26366a4062 Remove unused buffers and associated support code from
InternalReturn.


git-svn-id: svn://localhost/ardour2/branches/3.0@10942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-08 14:14:21 +00:00
ae63588c02 improved WORKING fix for search path issues
git-svn-id: svn://localhost/ardour2/branches/3.0@10940 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 18:52:14 +00:00
Carl Hetherington
5700d10890 Check that adding a port to an IO is ok with the processors
in its route, and raise an error if not (part of #4535).


git-svn-id: svn://localhost/ardour2/branches/3.0@10938 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 17:50:56 +00:00
ff7785142d fix up some logic so that we don't replicate the session dir path twice in the search path(s)
git-svn-id: svn://localhost/ardour2/branches/3.0@10937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 17:45:18 +00:00
81b5814098 add visible() method to Tearoff so we can check whether or not it is hidden
git-svn-id: svn://localhost/ardour2/branches/3.0@10935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 15:48:00 +00:00
50aee54219 remove visible "sound notes" button,add Config parameter to control this (which then saves the state the user selected), add control to the prefs dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@10934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 14:23:32 +00:00
20aeb5af0a move CairoWidget into gtkmm2ext, add CairoPacker, made the time info box use CairoPacker, make the info status "bar" use CairoPacker
git-svn-id: svn://localhost/ardour2/branches/3.0@10933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:57:45 +00:00
2f837b66f7 switch to benjamin otte's implemention of fit_to_pixels() but leave uncommented because this prototype is not used; move 2 other non-ardour-specific utility functions into gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10931 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:07:43 +00:00
94658aa66e send correct PropertyChange for RouteGroup::set_route_active
git-svn-id: svn://localhost/ardour2/branches/3.0@10927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 03:22:06 +00:00
1c1c570898 send PropertyChange for RouteGroup::set_edit
git-svn-id: svn://localhost/ardour2/branches/3.0@10925 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 03:00:55 +00:00
06b52150ba send PropertyChange messages when changing RouteGroup properties
git-svn-id: svn://localhost/ardour2/branches/3.0@10922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 02:04:09 +00:00
d29fe416da if color property is not yet set, don't render
git-svn-id: svn://localhost/ardour2/branches/3.0@10915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:58:41 +00:00
5e3a3b56de add a new simple cell renderer to be used to allow color display/editing in treeviews
git-svn-id: svn://localhost/ardour2/branches/3.0@10913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:43:30 +00:00
c44e520d8c when doing a pure copy of a region, which resets the position, reset the position to the original after returning from the copy constructor. this keeps the semantics similar to the copy done usign a property list, where position etc. is expected to be set after construction. fixes #4519
git-svn-id: svn://localhost/ardour2/branches/3.0@10906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-05 18:49:04 +00:00
b0a2eb359d use the correct display for key accelerators
git-svn-id: svn://localhost/ardour2/branches/3.0@10893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 22:01:59 +00:00
af768c7429 be consistent in the way we merge environment-set search paths and pre-defined ones
git-svn-id: svn://localhost/ardour2/branches/3.0@10890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 21:08:34 +00:00
7a5a5da953 probably fix failure to find export formats in packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 20:05:50 +00:00
6fbd05a77d some more package debugging to help find out why export formats are not found
git-svn-id: svn://localhost/ardour2/branches/3.0@10887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 19:37:15 +00:00
9238253441 some package debugging to help find out why export formats are not found
git-svn-id: svn://localhost/ardour2/branches/3.0@10886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 18:48:28 +00:00
Carl Hetherington
e2d6d8e34d Remove unused variables.
git-svn-id: svn://localhost/ardour2/branches/3.0@10885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 16:59:19 +00:00
5b913f9a2b add PAINT_VERTA_GR and PAINT_BOX_GR to rgba macros (from Mike Dawes)
git-svn-id: svn://localhost/ardour2/branches/3.0@10874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 21:08:13 +00:00
34909f79ad Make Carbon GUI support for AU's optional at compile time (from Robin)
git-svn-id: svn://localhost/ardour2/branches/3.0@10872 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:42:27 +00:00
639bb7dc5d use compiler-generated _LP64 macro to detect x86_64 rather than USE_X86_64_ASM
git-svn-id: svn://localhost/ardour2/branches/3.0@10871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:38:31 +00:00
14d601a0ff revert recent change to Evoral::Event, and use static_cast<> to get from Event to MIDIEvent
git-svn-id: svn://localhost/ardour2/branches/3.0@10870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:34:58 +00:00
07b4626ea5 build changes from robin gareus for OS X, changing AU support to be used appropriately rather than GTKOSX
git-svn-id: svn://localhost/ardour2/branches/3.0@10869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:03:03 +00:00
d05a09991a catch up with is_silent change
git-svn-id: svn://localhost/ardour2/branches/3.0@10868 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 20:02:28 +00:00
5aa4d95f59 rename a Buffer/BufferSet method to be a little clearer as to its intent (is_silent(bool) => set_is_silent(bool))
git-svn-id: svn://localhost/ardour2/branches/3.0@10867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:53:33 +00:00
a38df56f97 correct code for MIDIEvent::is_{spp,mtc_quarter}()
git-svn-id: svn://localhost/ardour2/branches/3.0@10866 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:40:03 +00:00
a1cf2bba36 new configuration variable to control display of periodic MIDI messages
git-svn-id: svn://localhost/ardour2/branches/3.0@10864 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:33:46 +00:00
42944eccff probable fix for compile failures on OS X caused by unconditional inclusion of vst_plugin.cc in source list
git-svn-id: svn://localhost/ardour2/branches/3.0@10863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:32:42 +00:00
60e6b5d561 add 3 new is_foo() methods to MIDIEvent for testing for certain periodic MIDI messages
git-svn-id: svn://localhost/ardour2/branches/3.0@10862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:31:53 +00:00
ebc0b88248 make Evoral::Event be polymorphic by adding virtual to its destructor (why was this not done already?)
git-svn-id: svn://localhost/ardour2/branches/3.0@10861 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 19:31:19 +00:00
ad1ec2bacc get that fix for accels in tooltips correct this time
git-svn-id: svn://localhost/ardour2/branches/3.0@10856 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 03:40:56 +00:00
6a61ddb3af fix message about markup elements by changing accel strings from <Mod> to Mod-
git-svn-id: svn://localhost/ardour2/branches/3.0@10854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 01:58:32 +00:00
93d8451d9e significantly reduce rounding error when doing framepos_t + BBT math
git-svn-id: svn://localhost/ardour2/branches/3.0@10852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 22:54:50 +00:00
bcaccc5ece stop spewing debug output from SMFSource
git-svn-id: svn://localhost/ardour2/branches/3.0@10851 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 20:11:22 +00:00
b504c8cc90 fix a number of fundamental issues with Gtkmm2ext::Prompter, mostly centered on bad behaviour when Enter/Return is pressed
git-svn-id: svn://localhost/ardour2/branches/3.0@10848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 19:32:56 +00:00
8480cf69ce provide semantic ordering of simultaneous MIDI events; add operator== to MidiBuffer iterator; add empty() to MidiBuffer for no particular reason
git-svn-id: svn://localhost/ardour2/branches/3.0@10846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 16:22:51 +00:00
6a5a5b0340 commit to the "new" tooltip API, use set_tooltip_markup() rather than set_tooltip_text() to allow for more creative tooltips
git-svn-id: svn://localhost/ardour2/branches/3.0@10844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 21:07:11 +00:00
51138ef75b update CycleTimer to utilize NDEBUG and PBD::DEBUG so that we can leave them in place and use them at run time
git-svn-id: svn://localhost/ardour2/branches/3.0@10840 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 15:24:31 +00:00
Carl Hetherington
01acbbea80 Speculative fix for crash with untranslated messages
without | in them (#4521).


git-svn-id: svn://localhost/ardour2/branches/3.0@10838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-29 21:43:40 +00:00
8d2666e157 temporarily revert change that might be causing an endless loop while MIDI monitoring/recording
git-svn-id: svn://localhost/ardour2/branches/3.0@10836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-29 12:27:27 +00:00
a9a288b6a8 extra include required for S_()
git-svn-id: svn://localhost/ardour2/branches/3.0@10835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 21:07:22 +00:00
c05e30c043 add _S() macro to i18n.h for libs/ardour and libs/gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 20:38:23 +00:00
Carl Hetherington
23964284a4 Hopefully fix some i18n bugs (#3565).
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
eee1151e55 remove get_rt() call from graph code, since JACK takes care of that for us and all process threads are created using libjack thread API
git-svn-id: svn://localhost/ardour2/branches/3.0@10829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 15:58:25 +00:00
Carl Hetherington
e355b5df27 Add option to glue new regions to bars and beats (#4202).
git-svn-id: svn://localhost/ardour2/branches/3.0@10821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 19:33:13 +00:00
0a71d52448 Fix key bindings in tooltips for ArdourButton buttons.
Sinced gtkmm2ext needs to get at the actions of widgets, I moved the
action to Gtkmm2ext::Activatable.  Not sure if the wisest thing to
do here would be to use Gtkmm::Activatable, but figured there's
a reason Paul didn't do so (the name set_related_action is from there
so presumably it's known about), so this is the simplest change
that allows access to the action in Gtkmm2ext.  The vfunc calling
stuff should probably move there as well...


git-svn-id: svn://localhost/ardour2/branches/3.0@10818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 05:36:31 +00:00
0bd3105f50 Save references to external files in LV2 state as symbolic links.
With this commit it is possible to archive sessions that contain plugins with
complex file-containing state (e.g. Linuxsampler with a sample bank loaded)
with any archive tool, e.g.:

tar -hjcf session.tar.bz2 session

Which will give you a fully self-contained archive of everything used in the
session, so you can e.g. send it to a collaborator who may not have the same
sample banks in the same place as you and it will work.


git-svn-id: svn://localhost/ardour2/branches/3.0@10817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 00:53:45 +00:00
Carl Hetherington
5aec659c60 If a tempo change is inserted some way through a bar, fix up the time signature of the previous bar so that the tempo map remains consistent. Should help with #4200.
git-svn-id: svn://localhost/ardour2/branches/3.0@10816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 00:40:45 +00:00
Carl Hetherington
7548afd356 Fix some confusion over getting parameter details from
VSTs.


git-svn-id: svn://localhost/ardour2/branches/3.0@10814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 22:46:43 +00:00
8b07828f0b Remove silly print.
git-svn-id: svn://localhost/ardour2/branches/3.0@10812 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 19:55:26 +00:00
Carl Hetherington
2780e0ce5d Missing file.
git-svn-id: svn://localhost/ardour2/branches/3.0@10811 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 19:55:05 +00:00