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
Carl Hetherington
32c4217994
Fix up supplied templates missing from last commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 20:44:29 +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
33f62360a2
add middle-clock-on-range/marker-clock to locate there
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 17:26:48 +00:00
Carl Hetherington
1b3b9633b0
Set up ArdourButton state to match the action when the
...
action is attached. Fixes #4523 .
git-svn-id: svn://localhost/ardour2/branches/3.0@10979 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 17:08:47 +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
a94098ae9b
fix lack of marker/range display in marker/range list at startup, and tweak location display quite a bit to improve things (not done yet)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10977 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 16:16:48 +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
692f857b83
Yet another bug in previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10974 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 14:07:24 +00:00
Carl Hetherington
b4d7120a58
Fix some bugs I introduced with the last commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 13:42:18 +00:00
Carl Hetherington
ab4e7cf472
Move note creation code into a Drag; fix snapping of note
...
starts when drag-created (part of #4505 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@10972 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-11 12:54:54 +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
1390a1510d
Comment.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 13:48:41 +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
1244cae5c1
fix reference to name cell
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 19:56:01 +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
31264fbe43
Patch from colinf to fix reversed scroll in timeline rulers
...
wrt editor pane (#4549 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@10950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 18:22:40 +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
59526d29fd
Fix scroll-wheel direction in summary.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 15:57:59 +00:00
Carl Hetherington
2c07e83e4b
Use same modifiers with the mouse wheel in the summary as in the editor ( #4543 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 15:44:59 +00:00
Carl Hetherington
99edcd7940
en_GB translation from colinf ( #4545 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 15:32:10 +00:00
Carl Hetherington
05626747f0
Patch from colinf to use session_name_is_legal for snapshots too ( #4548 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-09 15:20:14 +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
Carl Hetherington
32c1c8a1c7
Justify text in first welcome screen, and fix grammar
...
(#4540 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@10941 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-08 12:05:32 +00:00
