13
0
Commit Graph

49 Commits

Author SHA1 Message Date
97d920593f drastic rethink of the relationship between remote control ID and route order keys. unless the user explicitly switches to UserOrdered, Route::_remote_control_id is an unallocated pointer, and Route::remote_control_id() simply returns a value based on the relevant order_key() value. Also, change the key used in the Route::order_keys std::map<> from a string to an enum, since there is no evidence that we are benefitting from the theoretical benefit of using a string. Generally tidy up allocation of order keys so that the master and monitor busses always get a "special" MixerSort key value, based on the MMC ID for master (already defined within Ardour), and all other tracks/busses start at zero. Syncing keys between editor and mixer will leave the MixerSort key for the master and monitor bus alone, reflecting the fact that we display these in their own distinct parts of the GUI and they are not orderable like other tracks or busses within the mixer window
git-svn-id: svn://localhost/ardour2/branches/3.0@12923 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 12:46:13 +00:00
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
4235e9a1a2 a variety of mostly unused parameter errors from OS X Lion's compiler
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-02 20:29:46 +00:00
3b1a065584 group tabs background/base color taken from the theme base. in the dark theme, its not quite so black and matches other base color areas
git-svn-id: svn://localhost/ardour2/branches/3.0@11723 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-17 17:14:15 +00:00
46b52f4b51 tweak menu item names in group context menu to make purpose more clear to new users and those with limited memories
git-svn-id: svn://localhost/ardour2/branches/3.0@10930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 12:28:23 +00:00
5468eb5788 clarify meaning of route group tab context menu items
git-svn-id: svn://localhost/ardour2/branches/3.0@10929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 03:28:19 +00:00
78db8a9445 notify when route group/group tab color changes
git-svn-id: svn://localhost/ardour2/branches/3.0@10912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:40:11 +00:00
Carl Hetherington
6de0f8a8a8 Sort session routes before trying to do the group tabs
collection; should fix #4500.


git-svn-id: svn://localhost/ardour2/branches/3.0@10749 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 22:38:44 +00:00
8ad4133d26 don't cache width & height for CairoWidget; provide option for all CairoWidgets to not draw their backgrounds; provide a static method to allow any (Container, probably) widget to provide background color to a CairoWidget without the requirement that it have its own window; remove existing cursor from clocks; clock text no longer has background attribute set, to correct a mistake in my understanding of pango attributes
git-svn-id: svn://localhost/ardour2/branches/3.0@10673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 15:35:58 +00:00
Carl Hetherington
e1905ccbf6 Open route group dialogue on Ctrl-right-click rather than Ctrl-left-click on a group tab to be more consistent with the rest of Ardour (#4466).
git-svn-id: svn://localhost/ardour2/branches/3.0@10638 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 00:38:12 +00:00
Carl Hetherington
eff5781ee1 Set group tabs dirty when their membership changes.
Should fix #4441.


git-svn-id: svn://localhost/ardour2/branches/3.0@10428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 17:18:51 +00:00
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
Carl Hetherington
10e1807fba Disallow black as a route group colour; force a dark
grey instead (part of #4064).


git-svn-id: svn://localhost/ardour2/branches/3.0@10061 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-07 11:56:29 +00:00
Carl Hetherington
932b0e9ec1 Update route colours when they are added to / removed
from groups which share colour (more of #4064).


git-svn-id: svn://localhost/ardour2/branches/3.0@10060 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-07 11:56:23 +00:00
Carl Hetherington
e3692bf3da Another try at fixing #4301.
git-svn-id: svn://localhost/ardour2/branches/3.0@10045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-31 20:46:16 +00:00
Carl Hetherington
9f1b50cc3e Fix thinko with dragging one of >1 tabs in the same
route group (#4301).


git-svn-id: svn://localhost/ardour2/branches/3.0@10044 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-31 19:26:25 +00:00
Carl Hetherington
881b5a43e7 Allow route groups to color their tracks (remainder of
#4064).


git-svn-id: svn://localhost/ardour2/branches/3.0@10043 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-31 19:14:12 +00:00
Carl Hetherington
7d32cf3813 Give route groups their own colour, settable from the route
group dialogue.  Americanise spelling of color in a few
places to avoid confusion.  Fixes #4224.  Addresses parts
of #2650 and #4064.


git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-30 09:48:53 +00:00
Carl Hetherington
82f8214277 Group tab fix from David Halter (#4268).
git-svn-id: svn://localhost/ardour2/branches/3.0@9995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-15 14:08:01 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
af0030a6de Make Route Group dialog instant-apply. Disallow identically-named route group; fixes #3689.
git-svn-id: svn://localhost/ardour2/branches/3.0@8481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-08 02:35:46 +00:00
Carl Hetherington
6df29331f7 Rename menu items on advice from Chris G.
git-svn-id: svn://localhost/ardour2/branches/3.0@8430 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 03:36:44 +00:00
Carl Hetherington
6933d6f945 Allow choice of direct or aux busses when subgrouping route groups. Fixes #3658.
git-svn-id: svn://localhost/ardour2/branches/3.0@8428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 02:36:29 +00:00
Sakari Bergen
80c61db0cd Fix compiler warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@8246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-11 15:09:47 +00:00
Carl Hetherington
7b29752441 Rename various things in the property system.
git-svn-id: svn://localhost/ardour2/branches/3.0@7681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 17:31:33 +00:00
Carl Hetherington
b374fb0202 Be sure to update group tabs when a route group is removed. Fixes #3408.
git-svn-id: svn://localhost/ardour2/branches/3.0@7671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-23 18:30:52 +00:00
Carl Hetherington
e2b5f355fb Various route group menu tweaks.
git-svn-id: svn://localhost/ardour2/branches/3.0@7446 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-19 23:26:40 +00:00
Carl Hetherington
536384ea4e Tweak group tabs class hierarchy and offer the same menu in both editor and mixer. Fixes #3336.
git-svn-id: svn://localhost/ardour2/branches/3.0@7441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-19 21:47:07 +00:00
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big)
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:18:43 +00:00
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 18:23:07 +00:00
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-19 20:26:31 +00:00
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
64dc5427e4 make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 23:29:48 +00:00
61cade6d59 drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling)
git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-10 03:25:32 +00:00
7703f0a76a move generic parts of Keyboard into gtkmm2ext. imperfectly done, but makes modifiers available in libgtkmm2ext now
git-svn-id: svn://localhost/ardour2/branches/3.0@6288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 22:51:32 +00:00
Carl Hetherington
759267af15 Various tweaks to group tabs, the main upshot of which is that you can start
a drag in an empty part of the group tab display and drag out a new route
group.


git-svn-id: svn://localhost/ardour2/branches/3.0@6249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-01 15:32:42 +00:00
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
Carl Hetherington
b233455b3f Split route group list out of Editor.
git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:37:15 +00:00
Carl Hetherington
acaf05db1d Update mixer group tabs on strip width change. Don't display the mixer group tab menu if there's not a group involved.
git-svn-id: svn://localhost/ardour2/branches/3.0@5265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-23 23:05:14 +00:00
Carl Hetherington
76a4b16742 Edit group on primary modifier click.
git-svn-id: svn://localhost/ardour2/branches/3.0@5252 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-23 00:27:52 +00:00
Carl Hetherington
9c7e23bad9 Popup the standard route group menu even when you don't right-click on a tab.
git-svn-id: svn://localhost/ardour2/branches/3.0@5251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 23:17:46 +00:00
Carl Hetherington
ef60a11af7 Maybe fix crash.
git-svn-id: svn://localhost/ardour2/branches/3.0@5246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 21:04:52 +00:00
Carl Hetherington
7b010a94ae No-op: comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@5245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 15:47:48 +00:00
Carl Hetherington
167929c25a Use the same menu for the editor route group list and the editor group tabs.
git-svn-id: svn://localhost/ardour2/branches/3.0@5242 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 01:25:21 +00:00
Carl Hetherington
c9e37fcc14 Option to fit a route group to the editor window.
git-svn-id: svn://localhost/ardour2/branches/3.0@5241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 01:01:43 +00:00
Carl Hetherington
442eef90ab Fix problems with dragging route groups so that they are too small.
git-svn-id: svn://localhost/ardour2/branches/3.0@5240 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 00:33:31 +00:00
Carl Hetherington
cfbec44c33 Add some more options to the route group list context menu. Fix a crash bug on removing route groups using the tab context menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@5239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-22 00:02:45 +00:00
Carl Hetherington
49928d3fa3 Refactor group tabs code a bit. Allow dragging of group tabs to alter group membership.
git-svn-id: svn://localhost/ardour2/branches/3.0@5237 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-21 22:17:17 +00:00
Carl Hetherington
955d731fa6 Merge edit and mix groups to just being route groups. Add properties to route groups to decide what things their member routes will share. Allow edits to happen across a route group without its tracks necessarily being selected.
git-svn-id: svn://localhost/ardour2/branches/3.0@5236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-21 19:59:56 +00:00