30968b8542
merge with master, including manual merge conflict resolution
2013-04-06 16:12:15 -04:00
cd6cbba299
rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit
2013-04-06 16:04:02 -04:00
8eef4b1904
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
07a505b1b2
lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure
2013-04-05 11:27:26 -04:00
19bd641915
commit immediately post linking
2013-04-04 18:45:27 -04:00
aaea166135
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
ddfc047f0e
Update region_ops.txt to match current behaviour, and fix a couple of comments.
...
Update region_ops.txt to better describe the current behaviour of
Editor::get_regions_from_selection_and_edit_point(), and fix a couple of
comments that still referred to the no-longer-existing 'edit' property of
route groups.
2013-04-03 23:21:53 +01:00
47efae83d1
Don't include unselected regions in edit grouped region operations.
...
Make Editor::get_regions_from_selection_and_entered() only return regions
that are actually selected or entered, not their unselected equivalents.
2013-04-03 18:21:12 +01:00
b49f2a10d2
Ignore track selection if there are any selected regions.
...
Make Editor::get_regions_from_selection_and_edit_point() only consider the
selected tracks when finding regions to operate on if there are no regions
selected, and never if the edit point is 'mouse'.
2013-04-03 17:29:34 +01:00
f4a9c02b1d
Use selection->regions instead of Editor::get_regions_from_selection()
...
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
2013-04-03 17:04:04 +01:00
0c3e840700
videotimline
...
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
d915650939
fix get_regions_after() -- used by videotimeline
2013-03-13 20:28:14 +01:00
8584c29933
tweak font/style stuff for the labels used on the left side of rulers
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 13:17:36 +00:00
17cbb458e7
fix restore of snap mode (confusion caused by existence of internal/preinternal snap modes)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 15:56:41 +00:00
46d884ff16
amend to prev commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 14:13:25 +00:00
3ced169911
14:03 < prokoudine> "GERMAN SCIENTIST DEMYSTIFIED ENGLISH CAPITALIZATION"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 14:07:00 +00:00
72393f101b
allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 22:46:51 +00:00
54ce76e8fd
remove "edit" property from track/bus groups; use "select" property which should force region selection to propagate, and then rely on "edit-applies-to-selection"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 17:50:29 +00:00
1224fc0700
add cycle-zoom-focus and bind to "1" by default
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 16:20:37 +00:00
ab90b7809a
typo that led to incorrect tempo based ruler stuff ... thanks, valgrind
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-11 17:29:31 +00:00
Ben Loftis
92e5a13fd4
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 20:48:44 +00:00
ba8953605d
fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelection::length() which didn't account for "no selection" in its return value
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:59:01 +00:00
67e842bf4c
remove debugging/analysis output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-02 02:12:39 +00:00
Ben Loftis
f77763020b
edit operations should depend on the existence of an explicit range, NOT the mouse mode. this produces less confusion to the user. For an edit (such as delete) the selection should be based on this priority: explicit range selection, ojbect (region) selection, and then implicit range ( i.e. mouse-to-marker)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-28 17:07:35 +00:00
b286b45ea8
adjust the way we use a pair of iterators into the tempo map so that the iterators are always local to the scope where they are used, which fixes at least one tempo-map related crash; also fix correct setting of join-object-range parameter, where the property wasn't actually used
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 22:48:59 +00:00
12fadcc43e
try another fix for the crash created by rev 13547
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 13:21:21 +00:00
Ben Loftis
e63da83c53
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 22:43:10 +00:00
Ben Loftis
beb3ec2d7a
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 19:43:43 +00:00
Ben Loftis
6b6ef35f3e
new button look
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13511 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-16 19:27:39 +00:00
5cdc9239e0
move internal edit button away from mouse mode buttons by a small distance, and change its tooltip to match website terminology
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13509 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-15 19:36:09 +00:00
98834c0532
remove a bunch of cerr output and/or convert to use error<<
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
86e16e723e
Revert "fix small screen mode width"
...
This reverts commit e963a8dbc1d71aa78bed9407bafd7f8948db9712.
git-svn-id: svn://localhost/ardour2/branches/3.0@13449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:43:12 +00:00
e3a010ff69
fix small screen mode width
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-12 13:31:13 +00:00
82fb1acf2a
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 15:19:58 +00:00
760ccbabfb
add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
4f77bf201e
make more or less all LHS treeviews use the same style
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13056 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-20 01:47:27 +00:00
deb202b1f7
comment out some unused parameter arguments
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-09 19:43:29 +00:00
Carl Hetherington
c1d4f87471
Fix crash on trying to snap to markers when there aren't
...
any (#4988 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:53:44 +00:00
Carl Hetherington
25e5bfd17e
Rename Editor::duplicate_dialog to Editor::duplicate_range
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 21:31:06 +00:00
958c63bd18
minor cleanups from 12952
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-28 14:32:26 +00:00
11415b49be
first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 22:57:06 +00:00
Carl Hetherington
098f0157df
Allow new idle visual changer calls to be requested while
...
the current changer is executing; fixes #4567 .
git-svn-id: svn://localhost/ardour2/branches/3.0@12934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-26 00:07:45 +00:00
3287d5534d
use the pane watcher to prevent the nastiness that occurs when the RHS editor list is dragged so that the pane handle "vanishes" into the tabs. this used to only be a problem on OS X, but a variation of the problem is there on X11 too ( fixes #4410 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-22 16:48:56 +00:00
Carl Hetherington
3c7f6a4a4c
Unify clamping of frames-per-unit values during zoom; should help with #3514 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 14:14:27 +00:00
Carl Hetherington
0fba3e073c
Remove indirected method calls.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 14:14:22 +00:00
Carl Hetherington
95377c141c
Hacky fix for track height step losing 'grip' on the
...
track being resized (#4503 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 16:57:21 +00:00
Rodrigo Severo
f9ed2ced4a
Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 04:21:46 +00:00
b0fdefb7af
maximise-editor patch from Rodrigo:
...
* makes "View >> Toolbar When Maximized" act immediately, i.e., even when already maximized changing this toggle changes whenever toolbar is shown or not;
* renames "Toolbar When Maximized" to "Show Toolbar" as it acts whenever editor has maximized space or not.
git-svn-id: svn://localhost/ardour2/branches/3.0@12668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 04:20:13 +00:00
Carl Hetherington
fc77252d51
Slightly unpleasant hack to stop control points being
...
unselected when you ctrl-drag a selected point in order to
do a push drag.
git-svn-id: svn://localhost/ardour2/branches/3.0@12502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 14:39:48 +00:00
Carl Hetherington
d33c0d96fb
Patch from colinf to avoid splitting unselected regions
...
on the same track as a selected region; also make no
selection = all tracks button work (#4831 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 19:36:27 +00:00
