13
0
Commit Graph

7755 Commits

Author SHA1 Message Date
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
Carl Hetherington
c0f435d36a Patch from Prokoudine to fix translators list (#4580).
git-svn-id: svn://localhost/ardour2/branches/3.0@11048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 14:01:18 +00:00
5cd27a4a85 similar to treatment of meter markers, remove tempo marks from the tempo map while dragging, to avoid wierd side effects
git-svn-id: svn://localhost/ardour2/branches/3.0@11047 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:53:33 +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
a9adbd9404 remove comment
git-svn-id: svn://localhost/ardour2/branches/3.0@11045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 02:11:03 +00:00
Carl Hetherington
e0e2d2a061 Missing file.
git-svn-id: svn://localhost/ardour2/branches/3.0@11041 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 00:58:12 +00:00
Carl Hetherington
e62e94b63c Some tinkering with the docbook manual, just for more kicks.
git-svn-id: svn://localhost/ardour2/branches/3.0@11040 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 00:56:07 +00:00
Carl Hetherington
5c1e4e1c79 Un bit-rot the docbook manual build, just for kicks.
git-svn-id: svn://localhost/ardour2/branches/3.0@11039 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-21 00:55:57 +00:00
06320b2ed3 use the same kludge-removal approach in the prior commit for the meter dialog too, and fix a minor bug in the tempo dialog setup
git-svn-id: svn://localhost/ardour2/branches/3.0@11028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 16:56:07 +00:00
6227b5d473 rework tempo dialog to (a) allow selection of pulse note type (b) avoid awful kludge to get note type from the combobox; show pulse note type in tempo markers
git-svn-id: svn://localhost/ardour2/branches/3.0@11027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-20 16:29:44 +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
ca9a444aa9 do not convert from grid-type-beats to frames and back to beats when determining the length of a ghost note or the actual note to be inserted on button-press: just use grid-type-beats as is
git-svn-id: svn://localhost/ardour2/branches/3.0@11021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19 18:32:57 +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
fb5f590b11 Show generic plugin UI toolbar (for presets etc.) on LV2 UIs (except external).
git-svn-id: svn://localhost/ardour2/branches/3.0@11019 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-18 02:25:19 +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
9f0eed8d7e updated czech translation from pavel fric
git-svn-id: svn://localhost/ardour2/branches/3.0@11017 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-17 16:40:35 +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
Carl Hetherington
c3d1a8dda5 Patch from GMaq to add Freedesktop category
AudioEditing.


git-svn-id: svn://localhost/ardour2/branches/3.0@11010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 12:11:49 +00:00
Carl Hetherington
e5200de78a Patch from colinf to fix name in French translation (#4565).
git-svn-id: svn://localhost/ardour2/branches/3.0@11009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 12:10:11 +00:00
38707ea06b do not delete GtkUIManager-generated menu from ProcessorBox when the PB is destroyed. read the comment for more details
git-svn-id: svn://localhost/ardour2/branches/3.0@11008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 02:19:21 +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
fe06030f02 new renderings (at 21x21) of zoom icons, from roy vegard
git-svn-id: svn://localhost/ardour2/branches/3.0@11003 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-14 17:03:28 +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
b6d1fb0707 fix meter marker drags by not using a fake marker till first move, and swapping the grabbed item to the copy when we do
git-svn-id: svn://localhost/ardour2/branches/3.0@10999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 19:43:41 +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
6aaf4ea17a Add select all / deselect all to timespan section of export dialogue (#4273).
git-svn-id: svn://localhost/ardour2/branches/3.0@10994 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 00:15:17 +00:00
Carl Hetherington
1deb4fd7ad Make the export ranges view expand with the export dialogue.
git-svn-id: svn://localhost/ardour2/branches/3.0@10993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 00:15:11 +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
Carl Hetherington
af768486c9 Make the MidiRegionSelection notice when its MidiRegionViews go away; fixes one source of memory corruption during MIDI edits.
git-svn-id: svn://localhost/ardour2/branches/3.0@10991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 19:03:46 +00:00
be371bedb9 improve layout and display of CD range info in location display
git-svn-id: svn://localhost/ardour2/branches/3.0@10989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 15:13:10 +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
4dd7b9b34c Make TimeAxisView::remove_child virtual so that RouteTimeAxis can override it to also remove the same child from its _automation_tracks list. Prevents a shared_ptr to an out-of-date AutomationTimeAxisView hanging around; fixes #4554.
git-svn-id: svn://localhost/ardour2/branches/3.0@10985 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-12 02:17:17 +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