Commit graph

184 commits

Author SHA1 Message Date
Paul Davis
2acc37e38d merged with 3.0, probably finished 2013-03-12 17:36:51 -04:00
Paul Davis
26741db3c4 merge -r 13414:13599 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 ; plus a few tweaks that will be cleaned up soon
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13600 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-05 14:33:11 +00:00
Paul Davis
680ea1118c merge 13034:13103 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-02 14:33:56 +00:00
Paul Davis
129dcd7f97 merge 12607:12717 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-14 01:09:40 +00:00
Paul Davis
f228d2c68e merge 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-08 14:03:30 +00:00
Paul Davis
8e1db53556 merge -r12436:12545 from 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 16:21:08 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 19:01:24 +00:00
Paul Davis
d6edbf5ca2 merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-14 18:35:19 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 17:06:21 +00:00
Carl Hetherington
ed12f85c88 Add tooltips to plugin controls in the processor box
(#4697).


git-svn-id: svn://localhost/ardour2/branches/3.0@11741 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-21 14:13:48 +00:00
Paul Davis
78abd0538b use improved copying send/return/port insert fix in GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11692 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-15 02:31:30 +00:00
Paul Davis
359e4c8656 use new design for processor drag-n-drop
git-svn-id: svn://localhost/ardour2/branches/3.0@11671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-13 20:15:50 +00:00
Carl Hetherington
c74c4d3803 Remove a few unused methods from ProcessorBox.
git-svn-id: svn://localhost/ardour2/branches/3.0@11617 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-07 14:40:14 +00:00
Paul Davis
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
Carl Hetherington
35a4144e45 Add aux sends at the position that the menu was opened, rather than always pre-fader (#4660).
git-svn-id: svn://localhost/ardour2/branches/3.0@11387 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 18:09:54 +00:00
Carl Hetherington
b3b28e82b5 Slightly hacky-fix for misbehaviour when drag-and-dropping processors onto the blank entry (#4668).
git-svn-id: svn://localhost/ardour2/branches/3.0@11385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 22:51:36 +00:00
Carl Hetherington
b447024c32 Add option to use plugin GUIs or Ardour generic ones.
git-svn-id: svn://localhost/ardour2/branches/3.0@11298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 10:18:37 +00:00
Carl Hetherington
c95b34642f Use a button in the processor box for toggle parameters.
git-svn-id: svn://localhost/ardour2/branches/3.0@11297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 22:54:36 +00:00
Carl Hetherington
a1ecad4cfe Restore option to open a plugin editor built by Ardour,
rather than by the plugin; I erroneously removed this
option in a previous commit.


git-svn-id: svn://localhost/ardour2/branches/3.0@11295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 22:10:07 +00:00
Carl Hetherington
eac552b549 Allow individual plugin controls to be shown / hidden.
git-svn-id: svn://localhost/ardour2/branches/3.0@11294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 20:32:13 +00:00
Carl Hetherington
4381b590bb Reinstate user Controllable values, as they are needed
for gain (which I forgot about).


git-svn-id: svn://localhost/ardour2/branches/3.0@11293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 16:38:56 +00:00
Carl Hetherington
a8bb49e5d8 Add a send amp's gain control as a send controllable.
Tweak AutomationControl now that PBD::Controllable has
a default implementation of user_to_ui and ui_to_user. 
Add correct implementations of these methods to
Amp::GainControl.  Hence allow SendProcessorEntry to
use the generic mini-fader-adding code from
ProcessorEntry.


git-svn-id: svn://localhost/ardour2/branches/3.0@11292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 16:38:45 +00:00
Carl Hetherington
5a53f2f1b9 Simple approach to putting plugin controls into the
processor box.


git-svn-id: svn://localhost/ardour2/branches/3.0@11288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 18:02:48 +00:00
Paul Davis
744c8f572f make dbl-click on send toggle back *and* forth between send/regular strip display
git-svn-id: svn://localhost/ardour2/branches/3.0@11284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 15:53:21 +00:00
Paul Davis
cc5e8d41da patch from colinf to make dbl-click on send "box" map its controls to the strip; remove related stub functions from ProcessorBox; fix crash when removing send due to the process lock not being held
git-svn-id: svn://localhost/ardour2/branches/3.0@11274 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 03:39:45 +00:00
Carl Hetherington
b5c532972a Account for ProcessorEntry::_processor being 0 in a few places; remove unused ProcessorBox::build_processor_tooltip.
git-svn-id: svn://localhost/ardour2/branches/3.0@11201 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 01:33:24 +00:00
Carl Hetherington
5901b0ee76 Remove an unnecessary assert that now trips.
git-svn-id: svn://localhost/ardour2/branches/3.0@11200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 20:27:34 +00:00
Paul Davis
c9de3c5a16 add an empty ProcessorEntry before the fader if there are no pre-fader processors, to strongly visually indicate that you can insert new processors there; add back a fixed, static tooltip for the processor box
git-svn-id: svn://localhost/ardour2/branches/3.0@11187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-07 17:10:18 +00:00
Paul Davis
38707ea06b do not delete GtkUIManager-generated menu from ProcessorBox when the PB is destroyed. read the comment for more details
git-svn-id: svn://localhost/ardour2/branches/3.0@11008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-15 02:19:21 +00:00
Paul Davis
9a85516623 cleanup vertical spacing a bit in mixer strip; rename new send options to be more clear on the difference; relabel "sends" button to say "Aux Sends" to be clearer on what it does; code tidy up in processor box and mixer strip
git-svn-id: svn://localhost/ardour2/branches/3.0@10850 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 19:34:53 +00:00
Carl Hetherington
86d927b4dd Make activate/deactivate all only operate on visible
processors (and also exclude the fader) (#4475).


git-svn-id: svn://localhost/ardour2/branches/3.0@10649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 17:40:16 +00:00
Paul Davis
e2757229a7 provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates
git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 19:33:09 +00:00
Carl Hetherington
9d56b190ad Don't try to open SendUI for an internal send (#4460).
git-svn-id: svn://localhost/ardour2/branches/3.0@10513 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-09 19:25:30 +00:00
Carl Hetherington
e63989c8d1 ProcessorBox actions are static, so setting their sensitivity must be done just before the menu is opened, not when the selection in one ProcessorBox changes (otherwise there are problems when you select in one box then open a menu in another). Also clarify what can and cannot be renamed, processor-wise.
git-svn-id: svn://localhost/ardour2/branches/3.0@10495 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-08 14:44:06 +00:00
Carl Hetherington
8f78fad338 Fix unused variable.
git-svn-id: svn://localhost/ardour2/branches/3.0@10463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-05 17:55:16 +00:00
Paul Davis
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
Carl Hetherington
69413ea089 Add tooltips for processors (#4447).
git-svn-id: svn://localhost/ardour2/branches/3.0@10437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 16:09:45 +00:00
Paul Davis
be27c457f6 revert early change that forwarded key events to editor, since it can cause an infinite loop (i think because the event carries the window in which it occured
git-svn-id: svn://localhost/ardour2/branches/3.0@10431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 21:52:02 +00:00
Paul Davis
92c02b2fdd forward non-used keys from mixer (strip) to "everything else" (editor, really), and add stubs for processors_up and processors_down in mixer strip
git-svn-id: svn://localhost/ardour2/branches/3.0@10425 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 16:19:14 +00:00
Carl Hetherington
11d604dea3 Remove edit option from internal send context menus; it's pretty confusing, and there is a fader just underneath the send processor's label to edit its level.
git-svn-id: svn://localhost/ardour2/branches/3.0@10409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-03 02:20:51 +00:00
Paul Davis
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
Paul Davis
fb5485261a more button event handling tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@10369 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-31 23:59:54 +00:00
Paul Davis
25949e9d83 various tweaks to get clicks on processor "buttons" to work right and to keep track of processor state and position, hopefully
git-svn-id: svn://localhost/ardour2/branches/3.0@10349 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-31 15:28:21 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Carl Hetherington
153ee4e441 Fix insertion of processors at the point at which the processor menu was opened; give a visual cue to indicate where a processor will be inserted. Kind of experimental.
git-svn-id: svn://localhost/ardour2/branches/3.0@10236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 16:53:36 +00:00
Carl Hetherington
5c97b7a9cf Make all-processors-active act an all processors rather than just pre/post-fader ones depending on where the mouse was clicked to open the menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@10233 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 14:26:40 +00:00
Carl Hetherington
8232d4ab6f Adjust send faders depending on what signal type they are passing (part of #4352).
git-svn-id: svn://localhost/ardour2/branches/3.0@10230 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 10:01:37 +00:00
Paul Davis
4aeebb914e changes for OS X support: change waf config define to COREAUDIO_SUPPORT, remove PluginInsert call to IO::PortCountChanged, remove use of explicit Carbon linkage, fix up AudioUnit internals to actually work (Cocoa GUIs still currently broken)
git-svn-id: svn://localhost/ardour2/branches/3.0@10224 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 15:08:42 +00:00