13
0
Commit Graph

503 Commits

Author SHA1 Message Date
bca1be28e3 avoid unnecessary multiple calls to RouteUI::update_monitoring_state() 2016-07-04 09:27:33 -04:00
d233b33707 operate directly on realtime controls, not via Session 2016-07-04 09:27:33 -04:00
176660fff4 fix logic of RouteUI::set_color_from_route() 2016-07-01 18:03:29 -04:00
15fcb0845a make sure RouteUIs show selection status at startup 2016-06-10 13:57:18 -04:00
d403eaf1a0 phase out phase in favor of polarity 2016-06-10 01:18:20 +02:00
212afd402c color management and handling for VCAs 2016-06-09 16:03:14 -04:00
0678d0ada1 use new ControlSlaveUI object in mixer strip 2016-06-09 13:12:09 -04:00
3f0cbfc152 comment and minor fix 2016-06-08 21:25:48 -04:00
7015ece8ef use 4.x and earlier route colors 2016-06-08 21:18:20 -04:00
f0eef82364 alphabetize local includes 2016-06-08 21:18:20 -04:00
01812f53c3 use, or mostly use PresentationInfo for selection status of Routes.
Needs extension to Surfaces, replacing GuiSelectionChanged signal concept
2016-06-05 20:50:57 -04:00
3e12d4b4a6 use PresentationInfo color to set route colors. GUI appears to respond as expected 2016-06-05 17:16:20 -04:00
b69776ba15 catch up on change in definition of various AxisView {set,is}_selected() implementations 2016-06-05 16:33:02 -04:00
bdd2f25c8b RouteUI is no longer an AxisView so use ARDOUR_UI::instance()->gui_object_state() directly 2016-06-05 16:33:01 -04:00
77f19ff8da add braces 2016-06-05 16:33:01 -04:00
c31435b474 RouteUI is now also derived from SessionHandlePtr but NOT AxisView. Fix initialization.
Only "most derived" classes can initialize virtual base classes (SessionHandlePtr)
2016-06-05 16:33:01 -04:00
2aeb33989e adjust color API for RouteUI to use PresentationInfo's color 2016-06-05 16:33:01 -04:00
171b70927a make AxisView::marked_for_display() be virtual so we can use the a Stripable's PresentationInfo hidden() status 2016-06-05 16:33:01 -04:00
8818e1887a there is no explicit "Remote Control ID" control anymore - all done by ordering in the GUI 2016-06-02 19:19:22 -04:00
d30266dfc3 use new record safe control in GUI 2016-05-31 15:30:45 -04:00
482873760c initial implementation of VCA time axis views 2016-05-31 15:30:44 -04:00
f022784014 convert editor routes code to use Stripable 2016-05-31 15:30:44 -04:00
e0ff70cf86 first vaguely working version using PresentationInfo
remote control ID and "order keys" have been removed.
2016-05-31 15:30:42 -04:00
5b5e64d860 remove Route::listening_via_monitor()
This is better tested with direct use of the solo_control and
Config->get_solo_controls_are_listen_controls()
2016-05-31 15:30:41 -04:00
69250b64ea move ever close to working master/slave logic, this time with audio testing 2016-05-31 15:30:41 -04:00
202ddba9e2 remove more debug output 2016-05-31 15:30:41 -04:00
6de4953be8 a variety of changes that get closer to correctly functioning behaviour for VCA solo+mute (BUT ARE NOT DONE YET) 2016-05-31 15:30:41 -04:00
4615e090b4 remove some debug output 2016-05-31 15:30:40 -04:00
e1bcd70712 a slew of as-yet incomplete work to get VCA solo+mute closer to working 2016-05-31 15:30:40 -04:00
b2b5c965c8 some tweaks for solo logic to get things working as they were before (correctly) 2016-05-31 15:30:40 -04:00
537272b3b1 direct connect monitoring changes to the real RouteUI method (no-op, really) 2016-05-31 15:30:40 -04:00
653ae4acd6 universal change in the design of the way Route/Track controls are designed and used. The controls now own their own state, rather than proxy for state in their owners.
Massive changes all over the code to accomodate this. Many things are not finished. Consider this a backup safety commit
2016-05-31 15:30:40 -04:00
c107f1ab56 show VCA master mute state in RouteUI, even if Config->get_show_solo_mutes() is false (since it is orthogonal) 2016-05-31 15:30:40 -04:00
36784ee94f use route automation control Changed() signals for solo/mute in GUI 2016-05-31 15:30:40 -04:00
75b327964b tweak mixer VCA button appearance and prepare for live updates to VCA state 2016-05-31 15:30:39 -04:00
d47dc72595 single button for VCA assignment, plus unassign now works 2016-05-31 15:30:38 -04:00
ac7df69b49 rec-safe GUI 2016-05-24 21:30:33 +02:00
6605b52c17 centralize rec-en sensitivity & prepare for rec-safe 2016-05-24 03:01:27 +02:00
cc0abf4ef5 add route-ui pin-manager 2016-05-10 20:54:11 +02:00
e180b0f706 RouteUI solo buttons should trigger group actions 2016-03-14 10:49:24 -04:00
bfbf260eaf when using InverseGroup for rec-enable, do not collect group members and pass them to a session RT event method 2016-01-25 22:10:43 -05:00
c338057b7b NOOP: whitespace fixes 2016-01-25 22:08:47 -05:00
5fd07fe3af when using InverseGroup for solo, do not collect group members and pass them to a session RT event method 2016-01-25 22:08:23 -05:00
7b6142ed99 when using InverseGroup, do not collect group members and pass them to a session RT event method 2016-01-25 22:06:41 -05:00
23794eca5b rename Controllable::WholeGroup => InverseGroup to reflect real intent.
Add logic to RouteGroupMember::use_group() to implement the real intent of InverseGroup
2016-01-22 11:58:31 -05:00
9e5b7db89f first compiling, mostly working version of group controls changes 2016-01-22 11:58:31 -05:00
64c9198d60 add group disposition argument to Route::set_gain() and use it in various UIs
Executive decisions were necessary in a couple of places about the correct group disposition
behaviour, notably faderport and OSC surfaces
2016-01-18 12:11:09 -05:00
7edd521afe unhardcode "ardour:" port-prefix 2015-12-21 18:54:34 +01:00
6f955aa0bd add Duplicate action to track and mixer context menus 2015-11-17 16:55:11 -06:00
André Nusser
6ccffbaf09 Improve behavior of overwrite_file_dialog.
- Make overwrite file dialogs transient.
- Cancelling the overwrite dialog doesn't close initial dialog.
2015-11-04 17:52:00 -05:00
André Nusser
5d50abed75 Confirmation on overwrite for track and session templates. -fixes #6587 2015-10-21 23:28:44 -04:00
696b89b71a rework 8b80fe0, use std::string, not char* 2015-10-15 11:24:15 +02:00
dee89fb98a add missing include 2015-10-07 15:39:32 +02:00
0d137f7bdf fix solo-group override 2015-10-07 15:29:00 +02:00
e79b2e376f amend prev commit. 2015-10-07 14:25:33 +02:00
a02fc6340b update solo button callback semantics
override-group toggles current group state (not disables groups)
2015-10-07 14:21:30 +02:00
3bb492a0c0 fix crash for solo btn2 + primary-mod 2015-10-07 14:21:30 +02:00
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
4dc63966f0 globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
André Nusser
42647c9920 Introduce Ctrl+Shift+Click on lock solo in the mixer. 2015-09-28 17:58:40 -04:00
6b019a4953 Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
2015-09-16 16:55:17 -04:00
a95b6cfd92 ctrl-shift-click on solo isolate now enables AND disables solo-isolate for all routes.
It would be nice to have operate-on-selection for all this RouteUI stuff, wouldn't it?
2015-07-16 10:11:04 -04:00
64586a8301 factor out Route::muted_by_others from existing code 2015-05-29 15:21:20 -05:00
1d5c6104f5 replace old ArdourButton::Icon API with Gtkmm2ext. 2015-05-24 21:45:39 +02:00
db7d0c59b5 remove explicit VectorIcon Element 2015-05-24 20:28:24 +02:00
d25e8f2233 update ArdourButton Icon API 2015-04-07 22:34:09 +02:00
803853b4a4 rationalize incorrect design for removing tracks.
Still requires a way to make this work correctly from the mixer window
2015-04-06 17:56:23 -04:00
e31d6a90f7 protect RouteUI's destructor from crashes caused by MeterStrips with no route.
MeterStrip class heirarchy needs fundamental redesign.
2015-04-01 11:58:31 -04:00
d6574c9c40 remove duplicated calls to update solo/mute state from RouteUI descendants.
RouteUI::set_route() already does the right thing. Also remove RouteUI::mute_changed() since its
only role was to handle the mute change signal from a route, which boost::bind() makes unnecessary
since we can connect update_mute_display() directly.
2015-03-31 12:31:06 -04:00
75e0f5a023 remove GUI object state when tracks/busses are removed.
Not doing this results in accumulation of useless GUI object state which is never cleaned up.
Taken from work by Grygorii Zharun.
2015-03-30 15:27:23 -04:00
nick_m
c9d10158f6 Metadata windows are no longer transient windows.
Comment out input and output IOSelectorWindows being set to KEEP_ABOVE
in the route ui (just in case there is a good reason for it).
2015-03-12 04:06:20 +11:00
69069e0381 Fix whitespace (noop). 2015-01-07 20:12:14 -05:00
b5c9a92a58 Move Timers/Timeouts from ARDOUR_UI into functions in timers.h and use PBD::Timers 2015-01-01 19:04:14 +07:00
cf537b97f5 Add missing namespace qualifiers. 2014-11-30 23:56:19 -05:00
ea5876b836 Remove dead code. 2014-11-25 02:11:44 -05:00
de7ac1f29b yet another rec-button [no]blink fix 2014-09-07 21:03:25 +02:00
4a1b6b2e78 fix another blinking-rec btn issue (amend 0ae8dd4) 2014-09-06 13:23:59 +02:00
35d8f18990 hard stop blinking rec-arm 2014-09-05 17:26:21 +02:00
0ae8dd4bdb connect "blink-rec-arm" only when needed.
This also fixes rec-arm button display when Mixer strip
is showing an aux-send instead of the current route.

It's still only a half-baked solution. If "blink-rec-arm" is
to stay a lot of details related to this will need addressing.
2014-09-05 04:20:15 +02:00
09cec26610 fix some compiler warnings 2014-09-03 02:40:06 +02:00
c4212fb10b use tape-track rec-enable icon throughout. 2014-09-03 02:40:01 +02:00
5d5d859c2a use new 'special' rec-en button 2014-09-02 20:43:27 +02:00
4718def3c4 update track-header width when removing track(s). 2014-08-31 22:54:43 +02:00
f5533213c0 fix some compiler warnings 2014-08-30 02:26:36 +02:00
d6454dfb36 amend 7be3c88a, update rec-en color 2014-08-29 19:55:25 +02:00
7be3c88a3e experiment with unicode circle for rec-en
fixes button-area width mismatch on track-headers
except for tape-tracks (which till use old fixed size icon)
2014-08-29 01:13:49 +02:00
7306568634 More fixes to ArdourButton actions.
Optionally allow events to fallthrough to parents, in particular for the DnDVBox case.
Also allow the number_label to operate as a track selector.
2014-08-28 14:25:19 -05:00
61c11157c0 add option to blink rec-enables 2014-08-28 13:00:59 -05:00
3f297f7dab Fix ArdourButton event sequence.
Always give ArdourButton a chance to handle Press or Release events if you override them.
This allows ArdourButtons to do the "Pressed" animation
And it now correctly eats the event so button clicks don't select the channelstrip.
2014-08-28 10:31:57 -05:00
5db98d9372 fix pushed-in state of invert buttons, and fix an initizlization order warning 2014-08-27 10:49:36 -05:00
74f313dd6b Rationalize ArdourButton and lots of associated theming issues.
ArdourButtons now have a "pushed" animation.
The gradient is now implemented in the button, rather than providing 2 colors in the theme, which was burdensome.
Lots of code cleanup in ArdourButton.  Removed several unnecessary flags.
Refactor more stuff into route_ui.
2014-08-22 11:51:20 -05:00
c29417f48e Merge branch 'selection_fixes' of https://github.com/nmains/ardour into cairocanvas 2014-08-14 17:48:11 +02:00
nick_m
7e022b6445 Fix crash on snapshot change. 2014-08-15 01:42:48 +10:00
90397c3ac9 remove cruft related to button-height commit 2014-08-13 11:00:04 -05:00
3961017921 allow track headers to select io from right-click menu 2014-08-01 13:48:47 -05:00
b75b88a1eb Use text to specify combo box padding for better font/display tolerance.
Consistent mixer strip button height.

The latter works by setting all the button size request heights to the
calculated height of the alphabet.  Thus, all buttons of the same class will be
the same height regardless of their actual text.
2014-07-30 18:30:42 -04:00
b32823f074 Various UI tweaks.
Refactor comments dialog into Route_UI so it can be shared by tracks and strips.
Make Color and Comments selections consistent in the menus
Refine the color displays at the top of each mixer strip
Correctly color the number displays on tracks
2014-07-29 16:40:19 -05:00
a3b704b8c0 remove awful, inobvious, wrong and no longer necessary "_i_am_the_modifier" crap from RouteUI, except in one case where it might be useful 2014-07-10 11:54:59 -04:00
c52cb37bf2 suspend route redisplay for (rec-en, solo, mute and monitor) batch changes 2014-06-29 02:52:56 +02:00
a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
ce08ec0de0 substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
Group tabs now also get the text drawn in an appropriately contrast-y color
2014-06-09 23:29:00 -04:00
509159c3c6 first pass hiding/rearrangement of UI elements related to trx 2014-04-10 13:30:25 -04:00
5a90bef08b revert to use red border to indicate rec-arm instead of pink color 2014-03-25 08:02:26 -05:00
49d9397770 manually apply d697a31abf from master (git could not apply cleanly) 2014-02-19 23:44:53 -05:00
a0abf608d6 replace a few creeping instances of the string "Ardour" with PROGRAM_NAME 2014-02-10 10:53:01 -05:00
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
nick_m
5b62e88fbf Unify editor / mixer ordering. 2013-10-21 00:19:43 +11:00
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
9b091a52cb clean up 44fc92c3 (not a threading issue but sigc++ problem)
RouteUI is not sigc::trackable itself (only derived classes are)
RouteUI::~RouteUI() does not disconnect from signals on destruction.
2013-07-30 17:54:52 +02:00
44fc92c33d disconnect AuxSend connection when deleting bus
fixes crash:
 - add bus
 - aux-send a signal to that bus
 - delete bus
 - add another bus
 - aux-send a signal to "another bus"
 - click "Aux Send" button on "another bus"
 - crash
2013-07-30 15:12:32 +02:00
8013160eb3 meterbridge metrics update:
* display metrics for every used meter-type
* show metrics between meters with differnet types
* update text and label alignment for meterbridge
* fix crash when deleting metrics-strip (zero route)
* clean up metric pattern code (use float for dBFS)
2013-07-23 13:30:23 +02:00
c08b336292 Fix ambiguous type CheckMenuItem that is also defined via windows.h 2013-07-11 15:32:31 -04:00
ffc9a2cc70 Revert "replace "-inf" with UTF8 infinity symbol"
This reverts commit 7f2000ec8b0d6e0d3a6e22db44a8859301d35791.
2013-07-10 15:27:16 +02:00
c3a6b94090 hide solo button on master-bus 2013-07-10 15:27:16 +02:00
0f1f7ca4fd replace "-inf" with UTF8 infinity symbol 2013-07-10 15:27:16 +02:00
08167d6ac4 overhaul meterbridge metrics part one. 2013-07-10 15:27:04 +02:00
7dd6b4c915 more consistency for mute/solo/rec-enable press including making ctrl-click work even if the route is not part of a group
git-svn-id: svn://localhost/ardour2/branches/3.0@14054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-05 21:39:38 +00:00
2398b955c3 fix (1) lack of mute on master (2) lack of route-group driven behaviour for PRIMARY-click on mute button
git-svn-id: svn://localhost/ardour2/branches/3.0@14049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-05 18:16:10 +00:00
35cbfc9c0a improve international understanding.
git-svn-id: svn://localhost/ardour2/branches/3.0@13787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 13:29:55 +00:00
4481cca74a do not start editing track/bus names on a single click in the name entry of the track header - require double click; show name label rather than name entry when rec-enabled, to allow using the name area for track selection (name entry would have been visually still available for editing, which is misleading
git-svn-id: svn://localhost/ardour2/branches/3.0@13738 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-27 14:08:38 +00:00
3b8b088bd8 finish recent revert
git-svn-id: svn://localhost/ardour2/branches/3.0@13737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-27 00:57:39 +00:00
728374810d revert previous change- semantic confusion
git-svn-id: svn://localhost/ardour2/branches/3.0@13736 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 23:49:34 +00:00
d1c6e8b6d8 if route group shares color, make RouteUI::set_color() affect the group
git-svn-id: svn://localhost/ardour2/branches/3.0@13735 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 23:35:31 +00:00
6e337459a9 add a new Tweak to ArdourButton that makes ImplicitActive state use a solid color (the "led active" color), and adjst rec-enable buttons to use pink (like ardour2) when in this state (which means rec-enabled but not recording). and yes, this means that you can't use ImplicitUsesSolidColor with a button that also uses an LED - acceptable limitation
git-svn-id: svn://localhost/ardour2/branches/3.0@13645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-12 02:22:12 +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
0b55529ec4 tweak display of remote control id (dialog text)
git-svn-id: svn://localhost/ardour2/branches/3.0@13541 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-21 19:54:52 +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
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
Carl Hetherington
1b8a919f57 Small clean up of route colour setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@8933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-23 01:03:37 +00:00
Carl Hetherington
458925dba5 Fix mute visual state when reloading sessions with soloed tracks in PFL/AFL mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8928 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 21:14:51 +00:00
Carl Hetherington
13232d03f3 Modify route _processor list set up so that the logic for placing `invisible' processors (e.g. internal returns etc.) is in one place. Add option to get pre-fade listen from before or after pre-fade processors (#3781).
git-svn-id: svn://localhost/ardour2/branches/3.0@8903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-20 00:55:32 +00:00
Carl Hetherington
27cbe72d96 Remove dependence on the order of calls of listeners to MidiTrack::StepEditStatusChange, and rename the step entry menu item to make it consistent with the dialogue title. Should fix #3765.
git-svn-id: svn://localhost/ardour2/branches/3.0@8831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-12 12:29:20 +00:00
6ffc443eaa desensitize almost everything in a mixer strip when displaying send(s), to avoid user confusion about what can and cannot be modified
git-svn-id: svn://localhost/ardour2/branches/3.0@8609 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 15:28:58 +00:00
9361fa7b3a more meta-stasizing of the GUI rc file
git-svn-id: svn://localhost/ardour2/branches/3.0@8602 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-28 15:41:13 +00:00
Carl Hetherington
648035dba9 Add route group property to share route active state (#3703)
git-svn-id: svn://localhost/ardour2/branches/3.0@8497 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-10 23:37:34 +00:00
Carl Hetherington
75b1f698a1 Disable solo-controls-are-listen-controls if we don't have a monitor bus. Should fix #3660.
git-svn-id: svn://localhost/ardour2/branches/3.0@8436 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 20:52:30 +00:00
Carl Hetherington
04db4c788c Fix some confusion about handling of route extra XML. Fixes #3574.
git-svn-id: svn://localhost/ardour2/branches/3.0@8409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-02 12:45:29 +00:00
Carl Hetherington
118bb6d835 Add Save button to Save As Template dialogue.
git-svn-id: svn://localhost/ardour2/branches/3.0@8373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 22:27:48 +00:00
Carl Hetherington
6f306c9821 Add options to add sends from buses as well as tracks; remainder of #3637.
git-svn-id: svn://localhost/ardour2/branches/3.0@8372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 22:07:34 +00:00
Carl Hetherington
d725fc2d1c Make 'copy track gains to sends' and 'set sends gains' work with sends from busses. Partially fixes #3637.
git-svn-id: svn://localhost/ardour2/branches/3.0@8369 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:07:22 +00:00
Carl Hetherington
08b303c334 Convert 2.X route extra-xml to 3.0 format when it is loaded, to prevent multiple near-duplicate extra XML nodes in the resultant 3.0 session file.
git-svn-id: svn://localhost/ardour2/branches/3.0@8014 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-12 22:32:36 +00:00
Carl Hetherington
74cc8f6067 Fix multiple creation of identical automation tracks. Fixes #3482.
git-svn-id: svn://localhost/ardour2/branches/3.0@7848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-27 18:56:26 +00:00
Carl Hetherington
85977126b6 Use a maximum of 3 phase invert buttons per strip. Should fix #3455.
git-svn-id: svn://localhost/ardour2/branches/3.0@7789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-16 20:12:30 +00:00
da8eec7a83 remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
Carl Hetherington
136b8ed747 Fix restore of fader automation from 2.X sessions.
git-svn-id: svn://localhost/ardour2/branches/3.0@7754 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-07 23:26:21 +00:00
98d994f29c fix a variety of unused argument errors noted by gcc 4.3.2 on x86
git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-02 17:01:36 +00:00
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
4e2d805c9d Name phase invert buttons correctly so that themeing works.
git-svn-id: svn://localhost/ardour2/branches/3.0@7624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 23:16:43 +00:00
Carl Hetherington
063b91313f Implement per-channel phase invert. Fixes #3392. Breaks loading of existing 3.0 session files.
git-svn-id: svn://localhost/ardour2/branches/3.0@7621 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 21:33:01 +00:00