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
