13
0
Commit Graph

224 Commits

Author SHA1 Message Date
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
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
306e6475e5 Replace use of PBD::sys::path in ardour/template_utils.h
some associated changes from not including pbd/filesystem.h in template_utils.h

git-svn-id: svn://localhost/ardour2/branches/3.0@12833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:07:05 +00:00
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
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
ca993f56d6 make solo lock/safe button only respond to mouse button1 (#4691)
git-svn-id: svn://localhost/ardour2/branches/3.0@12354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-21 10:10:26 +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
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
f8b570db5e Show the number of channels in brackets when there is a single invert button for multiple channels, as suggested by colinf (#4699).
git-svn-id: svn://localhost/ardour2/branches/3.0@11598 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-05 22:06:16 +00:00
Carl Hetherington
8fca7c840d If there is one invert button for many channels, always use a menu; in this case, also partially light the invert button if only a subset of channels are inverted (#4699).
git-svn-id: svn://localhost/ardour2/branches/3.0@11593 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-05 01:16:50 +00:00
b08d13706f remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 17:43:55 +00:00
5e92f14dc5 make rec-enable click while step-editing exit step-editing mode... d'uh!
git-svn-id: svn://localhost/ardour2/branches/3.0@11442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 21:02:18 +00:00
b34e9155db remove apparently vestigial code from RouteUI::update_solo_display() that really could not/should not possibly have any effect because solo_button->set_active_state() is called unconditionally later in the function
git-svn-id: svn://localhost/ardour2/branches/3.0@11382 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 18:45:20 +00:00
104a92a128 allow Cancel button on route rename dialog to actually cancel
git-svn-id: svn://localhost/ardour2/branches/3.0@10849 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 19:33:28 +00:00
d4030cd32a tweak spacings in the mixer strip, tweak tooltip text for input and output buttons
git-svn-id: svn://localhost/ardour2/branches/3.0@10845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 21:07:43 +00:00
9bf55b26e8 fix phase invert button functionality, lost in switch to ArdourButton
git-svn-id: svn://localhost/ardour2/branches/3.0@10842 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 16:40:05 +00:00
a296820caf convert all mixer strip buttons to ArdourButton; not entirely finished because colors in the name and comments buttons don't work as intended - needs a bit of thinking
git-svn-id: svn://localhost/ardour2/branches/3.0@10830 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 17:58:15 +00:00
Carl Hetherington
7e5dea02fb Fix mute display on session load (#4480).
git-svn-id: svn://localhost/ardour2/branches/3.0@10703 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-19 12:18:20 +00:00
154f2eec09 master mute button should not show Mid state since master is never muted-by-others
git-svn-id: svn://localhost/ardour2/branches/3.0@10587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 17:49:37 +00:00
Carl Hetherington
420780f5fc Patch from acolomb to add a popup menu for solo iso/lock if
the buttons are not visible (#4419).


git-svn-id: svn://localhost/ardour2/branches/3.0@10560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 01:35:30 +00:00
Carl Hetherington
420d5d6592 Fix master bus mute button (#4455).
git-svn-id: svn://localhost/ardour2/branches/3.0@10493 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-08 13:17:11 +00:00
8f078d7fd4 drastic overhaul of keyboard handling in mixer window. real bindings, key events handled at window level, actions for all processor ops. still the confusing mess of old crap for the processor box context menu (it will die, i feel it)
git-svn-id: svn://localhost/ardour2/branches/3.0@10442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 17:53:21 +00:00
1a05a46a21 fix some bugs with solo state display
git-svn-id: svn://localhost/ardour2/branches/3.0@10415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 14:51:56 +00:00
Carl Hetherington
22d87a18dc Tidy up send-to button handling a bit, should fix #4426 and #4427.
git-svn-id: svn://localhost/ardour2/branches/3.0@10406 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 00:42:16 +00:00
bcac4f1c96 rec-enable buttons are now ArdourButtons, but with a minor graphical glitch that will be solved/fixed soon-ish
git-svn-id: svn://localhost/ardour2/branches/3.0@10402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 19:51:59 +00:00
11fdd6cd18 solo buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 18:48:32 +00:00
592bfa3616 mute and send-alert buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 16:46:49 +00:00
521937a9d1 catchup on previous commit relating to who owns ActiveState and VisualState
git-svn-id: svn://localhost/ardour2/branches/3.0@10372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-01 01:22:08 +00:00
5005ba060e provide control over precisely what aspects of an ArdourButton are rendered, and other button-related miscellany
git-svn-id: svn://localhost/ardour2/branches/3.0@10315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-27 11:53:16 +00:00
892f3c361e change CairoWidget API to be a more logical/intuitive for setting widget state, to differentiate between active state and visual state (prelight, insensitive etc)
git-svn-id: svn://localhost/ardour2/branches/3.0@10314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-27 11:24:43 +00:00
51ab5ccabf new ArdourButton class, to start to provide more control over how our buttons work and appear; use ArdourButtons for monitor, solo isolate and solo safe buttons, and in the processor box; don't save UI config file (canvas colors) to the user's home dir unless one or more parameters were modified by the user
git-svn-id: svn://localhost/ardour2/branches/3.0@10311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-26 21:01:14 +00:00
d8390f2195 tweak display logic for monitoring state so that explicit preferences take precedence over what is reported by Track::monitor_state() (this seems as if it should be unnecessary, but ...)
git-svn-id: svn://localhost/ardour2/branches/3.0@10269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-21 17:32:31 +00:00
bfe9010959 add route group support for monitoring choices
git-svn-id: svn://localhost/ardour2/branches/3.0@10268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-21 15:47:50 +00:00
8ff34fde9d correctly track monitoring changes in libardour and the GUI; required removing propagation of session rec-enabled status through process chain and replacing it with call to Session::actively_recording() where necessary (may require a new RT event)
git-svn-id: svn://localhost/ardour2/branches/3.0@10265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-21 15:05:33 +00:00
cc3d202571 start of tracking monitor state correctly
git-svn-id: svn://localhost/ardour2/branches/3.0@10264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-21 12:40:06 +00:00
3764eedca0 add initial implementation of explicit monitor (input|disk) control. some behaviour to be worked out, still
git-svn-id: svn://localhost/ardour2/branches/3.0@10256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-20 18:50:29 +00:00
32cc399595 revert debugging change from yesterday
git-svn-id: svn://localhost/ardour2/branches/3.0@10089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-16 11:39:18 +00:00
31abbdd17e debug the impossible
git-svn-id: svn://localhost/ardour2/branches/3.0@10088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-15 19:52:00 +00:00
Carl Hetherington
6972b09116 Delete RouteUI immediately on request, rather than in an
idle loop.  The idle loop bit is thought to be a
hangover from A2, and it causes #4315 because the
deleted ARDOUR::Route requests its references to be
dropped but its TimeAxisView hangs around for too long.


git-svn-id: svn://localhost/ardour2/branches/3.0@10066 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-08 17:48:58 +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
3b018f6902 Tidy up route colouring a bit so that colours are the
same for both the time axis view and the mixer strip.


git-svn-id: svn://localhost/ardour2/branches/3.0@10035 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-30 15:44:00 +00:00
Carl Hetherington
61d95b0bd0 Fix erroneous check for colons in track names; clean up
the dialogue a bit and go back to the name entry if the
user wants to re-edit.


git-svn-id: svn://localhost/ardour2/branches/3.0@9953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-03 13:28:36 +00:00
df78f284ee fix up colons in track names before they are used for JACK port names; catch most (not all) attempted renames and ask the user about colons
git-svn-id: svn://localhost/ardour2/branches/3.0@9928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-26 02:07:59 +00:00
10cb0a7646 introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-07 00:37:13 +00:00
1060243302 major, substantive reworking of how we store GUI information (visibility, height) for automation data. old design stored (insufficient) identifying information plus actual data in a GUI-only XML node; new scheme adds GUI data via extra_xml node to each AutomationControl object. reworked public/private methods for showing/hiding TimeAxisView objects; changed labelling of automation tracks to just show the name of the controlled parameter - more info can be viewed in the tooltip for the track headers. NOTE: Session file format ALTERED. No data loss but track visibility may be different than previous ardour3 versions
git-svn-id: svn://localhost/ardour2/branches/3.0@9703 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 15:35:34 +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
10280ab531 Remove erroneous note about playlists when removing busses.
git-svn-id: svn://localhost/ardour2/branches/3.0@9295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 00:31:55 +00:00
Carl Hetherington
eabe5b31f8 Hide/Remove to apply to the track selection.
git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 13:05:45 +00:00
Carl Hetherington
8f45604f27 Make Active apply to the selection.
git-svn-id: svn://localhost/ardour2/branches/3.0@9089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 13:04:46 +00:00
Carl Hetherington
f9e3a8b59f Make track context colour menu apply to all selected tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@8934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-23 01:03:51 +00:00