ardour/livetrax
13
0
Fork 0
Code
9,110 Commits 1 Branch 1 Tag 194 MiB
eb6e352dd0
Commit Graph

74 Commits

Author SHA1 Message Date
Paul Davis
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
David Robillard
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h). 
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 06:09:29 +00:00
Carl Hetherington
78237f3ac3 Display hardware IO individually in the port matrices unless we are in _show_only_bundles mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12348 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-20 21:56:28 +00:00
Paul Davis
ec1ef5d6b5 remove the apparently unnecessary "ui_bind()" macro from entire source base 
git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 12:58:19 +00:00
Carl Hetherington
19e97d1d64 Attempt to fix some confusions caused by bundles containing 
different types of port; if we loop over N MIDI channels of
a mixed bundle, for example, we must convert 0...N to the
indices of the channels within the bundle.  Also remove the
hack of creating new bundles to contain a subset of another
bundle's ports; if you do this, any signals emitted by the
other bundle are ignored.  Should fix #4454.


git-svn-id: svn://localhost/ardour2/branches/3.0@10490 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-08 02:10:56 +00:00
Carl Hetherington
44bfe88366 Don't show busses tab in MIDI connection managers, since 
there are no MIDI busses yet.


git-svn-id: svn://localhost/ardour2/branches/3.0@10365 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-31 22:44:01 +00:00
Carl Hetherington
07a58ffd62 Stop bundles disappearing from the port matrix when they 
have no channels (#4209).  Also fix the remove all
channels menu option.


git-svn-id: svn://localhost/ardour2/branches/3.0@9986 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-13 20:19:39 +00:00
David Robillard
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
Paul Davis
8b3d50f7e6 revert recent change to cleaner names for MIDI ports, which breaks certain other code that expects full port names 
git-svn-id: svn://localhost/ardour2/branches/3.0@9218 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-27 14:33:41 +00:00
Paul Davis
9dc28d1131 remove "alsa_pcm:" prefix from MIDI port names in the port matrix, to make things slightly easier to read 
git-svn-id: svn://localhost/ardour2/branches/3.0@9193 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-03-23 15:13:04 +00:00
Carl Hetherington
2cf464cf1d Further i18n fix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8397 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-30 21:01:14 +00:00
Paul Davis
4a9a5dea26 prevent the monitor inputs from showing up in the port matrix, fo'real 
git-svn-id: svn://localhost/ardour2/branches/3.0@8235 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-10 16:31:14 +00:00
Paul Davis
0108d1d900 don't show monitor bus inputs in matrix(es); relabel tabs in port matrix; change label for monitoring preference to be clearer 
git-svn-id: svn://localhost/ardour2/branches/3.0@8234 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-10 15:43:01 +00:00
Carl Hetherington
9afbb649b6 Use weak_ptr for IOs in the bundle list to avoid holding onto them when a route is removed. Fixes #3395. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7702 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-28 12:55:53 +00:00
Paul Davis
f5c4c8a293 forward port 2.X changes up to and including rev 6767 
git-svn-id: svn://localhost/ardour2/branches/3.0@7636 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-17 00:28:20 +00:00
Carl Hetherington
5d8933893c Put MIDI sync ports in the Ardour tab of the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-01 10:26:19 +00:00
Carl Hetherington
90c6ca876a Fixes to MIDI ports in the matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7526 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-01 10:26:02 +00:00
Carl Hetherington
a6a34361e6 Fix port matrix crash. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7525 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-01 10:25:55 +00:00
Carl Hetherington
1f07948972 Put Mackie surface ports into the Ardour tab of the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7522 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-30 02:09:39 +00:00
Carl Hetherington
66760a574a Don't display empty tabs in the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7521 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-29 19:25:26 +00:00
Carl Hetherington
1fd56c5476 Sort tracks in the port matrix according to editor order. Fixes #2966. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7458 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-21 02:17:57 +00:00
Carl Hetherington
92e4126617 Allow port matrix to show both audio and midi ports at the same time, and use that facility for route IO selectors. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7344 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-01 01:14:14 +00:00
Carl Hetherington
5f67a72c34 Basic tweaks to make the bundles and the port matrix accept that MIDI tracks may have audio IO, and vice versa. Allows connection of instrument tracks using the global port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7335 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-30 02:59:13 +00:00
Paul Davis
37978aa214 lots of details relating to MIDI file management; try to ignore ALSA sequencer MIDI ports named "Midi-Through" 
git-svn-id: svn://localhost/ardour2/branches/3.0@7305 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-06-26 13:45:59 +00:00
Paul Davis
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
Paul Davis
b66dfe0eea make system tab show up as default (most of the time) in port matrix 
git-svn-id: svn://localhost/ardour2/branches/3.0@6459 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-01-05 18:40:50 +00:00
Carl Hetherington
df7a3cc30c Fix compile. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6386 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 01:13:22 +00:00
Carl Hetherington
8e59a26ccf Add remove all and disconnect all to port matrix menu. Hide bundles whose channels are already represented by other, larger bundles. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6381 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-22 01:10:25 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Carl Hetherington
60cc81ea1a Restore port group tabs. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6363 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-13 22:21:04 +00:00
Paul Davis
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
Paul Davis
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
Carl Hetherington
dc86434283 Redraw the matrix correctly when available ports change in the currently visible tab. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6322 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-07 18:35:42 +00:00
Carl Hetherington
71f1b360a0 Give just one system tab rather than mono / stereo. Fix bundles-only mode of the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6321 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-07 17:39:13 +00:00
Carl Hetherington
abd80d0f64 Clean up and comment PortMatrix event handling a bit. 
Fix problems with attempts to access Session after it has been
destroyed.


git-svn-id: svn://localhost/ardour2/branches/3.0@6290 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-05 03:04:54 +00:00
Carl Hetherington
fe59ade874 Seconds out, the people vs. the port matrix, round 7. 
Some spacing adjustments.  Remove the hacky RouteBundle which caused more problems
than it solved.  Put notebook tabs close to the headings in the matrix.  Some other
minor tweaks.


git-svn-id: svn://localhost/ardour2/branches/3.0@6179 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-25 23:24:02 +00:00
Carl Hetherington
73a0cd56f8 Rework port matrix to use Gtk notebook tabs to select visible groups. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6117 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-18 13:35:31 +00:00
Carl Hetherington
2e02e157c3 Tidy up a bit in the case where the port matrix has nothing to display. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6089 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-15 00:26:28 +00:00
Carl Hetherington
53838fc350 Allow multiple bundles with the same ports in the bundle editor, otherwise sometimes important bundles can be incorrectly hidden. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6087 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-14 23:08:17 +00:00
Carl Hetherington
dbb0b9ca4f Various adjustments to user bundle handling, with the general aim of allowing the user to create meaningful bundles with respect to their sound card an outboard setup, and having those user bundles take priority over ardour-generated ones. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6050 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-10 03:16:57 +00:00
Carl Hetherington
660fd702af Various tweaks to the bundle manager. 
git-svn-id: svn://localhost/ardour2/branches/3.0@6030 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-11-07 20:33:41 +00:00
David Robillard
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
9649a94053 Don't add auditioner and click to MIDI connection port matrices. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5491 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-08-04 21:44:20 +00:00
Carl Hetherington
23f86529fd Clean up handling of add/remove/rename channels in the port matrix. Hence make it possible to do these things for any bundle (give or take). Clean up port matrix context menu. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5393 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-20 00:22:09 +00:00
Carl Hetherington
af5b9f92a5 Various tweaks to the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5380 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-18 13:10:08 +00:00
Carl Hetherington
000802d23f Oops from previous commit. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5379 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-18 04:05:26 +00:00
Carl Hetherington
0fb0da82a0 Pull auditioner and click into an ardour group in the matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5378 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-18 03:57:01 +00:00
Carl Hetherington
2e7eeef448 Better fix for non-rearrangement after open for the port matrix. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5377 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-18 03:17:47 +00:00