f03f2e5c3f
use new record safe control in surface support
2016-05-31 15:30:45 -04:00
28afaebdc4
fix SNAFU in which Stripable::rec_enable_control() was incorrectly defined as ::recenable_control()
...
Make Mackie support code use the Stripable to access the rec-enable control while we're here
2016-05-31 15:30:45 -04:00
a2704dbff8
use correct signal to select route from generic MIDI, and add explanatory comment
2016-05-31 15:30:43 -04:00
08f01085de
remove now-redundant control protocol route-selection signals
2016-05-31 15:30:43 -04:00
c438ba2b6e
remove no-longer-used TrackSelectionChanged signal from ControlProtocol
2016-05-31 15:30:43 -04:00
0d9433aef6
remove no-effect handling of route active-status change in Mackie Control code
2016-05-31 15:30:43 -04:00
9d2538ae72
remove any reference to Route in Generic MIDI support (basically a NO-OP)
2016-05-31 15:30:43 -04:00
cefd3ac8be
convert faderport to use Stripable instead of Route
2016-05-31 15:30:43 -04:00
186209c03c
fix crash in mackie code caused by assumption that all Stripables have meters
2016-05-31 15:30:43 -04:00
4b0a235f91
manually fix rebase/merge issues for Mackie Control support
2016-05-31 15:30:42 -04:00
4b7bbacaaa
make mackie surfaces aware of VCAs
2016-05-31 15:30:42 -04:00
c34ad3a723
convert Mackie Control Surface support to use Stripable, not Route
2016-05-31 15:30:42 -04:00
dd57a83793
add Stripable analogs for Route signals and methods in ControlProtocol
...
These will go away once all surfaces have migrated to Stripables
2016-05-31 15:30:42 -04:00
8346fab567
remove irrelevant, out of date and incorrect comment
2016-05-31 15:30:42 -04:00
d5127001bb
move ControllableDescriptor from libpbd to libardour; add support for describing VCAs
2016-05-31 15:30:42 -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
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
4b36593106
fix faderport and mackie to use route AutomationControls to be notified about solo/mute changes
2016-05-31 15:30:40 -04:00
aee283f056
use redesigned Route and VCA object architecture/API
2016-05-31 15:30:39 -04:00
nick_m
34c9ac9dd7
Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt()
2016-05-27 23:38:17 +10:00
b0200b23f2
Accommodate the fact that 'msvc_resources.rc.in' got moved to a new path
2016-05-21 10:33:18 +01:00
3060b7bbc4
upper parameter limit is inclusive.
2016-05-14 16:14:45 +02:00
ae7cc64377
copy-n-paste the ARDOUR_UI toggle-roll code into BasicUI (for Faderport and others)
2016-05-09 08:17:23 -04:00
672528baf4
fix shared_ptr<Route> management in Mackie support so that deleted routes are destroyed
2016-05-07 13:36:04 -04:00
17ace643e4
OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one)
2016-05-04 23:09:45 -04:00
8b52b69810
make BasicUI (for control surfaces) loop toggle work like the GUI
2016-04-30 10:54:40 -04:00
4a226385b6
OSC: Fix Solo to work with both SIP and Listen.
2016-04-27 09:06:46 -07:00
622ba89dd9
OSC: removed unused _namespace_root variable.
2016-04-19 16:13:18 -07:00
40aa4cfe06
Modify our MSVC projects to build liblua as a DLL rather than a static lib
2016-04-04 16:40:20 +01:00
234b06a18c
OSC: Changed gainVCA to gainfader as VCA is already used.
2016-03-29 07:58:20 -07:00
3eb5f76edb
OSC: fix issue 6839, make all OSC gaindB values below -192, inf.
2016-03-27 17:46:14 -07:00
6c3559dc6c
OSC: added a linear VCA style gain control for faders that are 0 to 1 linear.
...
path = /ardour/routes/gainVCA if RID position
2016-03-26 11:38:19 -07:00
83bcaa1882
plug a tiny memory leak
2016-03-19 10:51:26 +01:00
ba78359129
prepare for update to waf 1.8
...
uselib is no longer implicit (inherited by .use). This is still incomplete,
some uselibs for non-linux variants may be missing.
bld.is_defined("HAVE_XXX") also no longer works and will have to be
changed (I think to bld.env["HAVE_XXX"]) in countless places.
2016-02-28 21:16:44 +01:00
d3634c5779
Accommodate 'lua' search paths in various projects where they're needed
...
(i.e. so that MSVC can find header files from lua).
2016-02-27 16:29:55 +00:00
c932c56233
cleanup post-rebase-against-master messes
2016-02-22 15:31:25 -05:00
bc487bb4b0
replicate the remove-all-trailing whitespace commit(s) in master
2016-02-22 15:31:24 -05:00
379bc35948
update Mackie code to use new API to get all actions
2016-02-22 15:31:24 -05:00
67e19c177f
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition
...
We need this because we need binding information/objects before all
Actions have been defined.
2016-02-22 15:31:24 -05:00
f519edbe8e
fix segfault in libardour unit-tests (possible crash in mackie sf)
2016-02-20 20:26:34 +01:00
318f3850de
third time lucky
2016-02-19 23:25:15 +01:00
452bca79eb
and now without typo
2016-02-19 23:19:19 +01:00
9633ea3b01
fix Windows OSC support
2016-02-19 23:16:38 +01:00
f8bc9c66a5
OSC: remove "/session/loaded" message altogether, for testing on Win.
2016-02-16 16:06:39 -06:00
de94f3ce83
fix typo in previous commit
2016-02-15 17:29:54 -06:00
136f705af9
Defer session_loaded until AFTER lo_server_new.
...
This seems like the right thing to do, and -might- fix OSC on Windows.
2016-02-15 16:55:21 -06:00
a1d2c13077
mackie: if device type is unknown, make -D mackie show that
2016-02-07 10:28:07 -05:00
80a678de28
handle Mackie control device type ID = 0x6 (Behringer X-Touch Compact)
2016-02-07 10:28:07 -05:00
d862c357b3
change faderport name
2016-02-06 16:42:34 -06:00
09921e1d76
Mackie: shift+marker needs to remove marker. moved session-range to shift+solo.
...
Originally cbbd87f50b in mixbus/master
2016-02-06 15:47:27 -05:00
5516e3bdd2
mackie: better fix for
2016-02-06 14:24:06 -05:00
3b1d1675de
mackie: stop crashes when switching to X-Touch Compact device
2016-02-05 17:59:29 -05:00
ff14f4d63c
Mackie Protocol: more fixes for aac6a5
2016-02-04 11:44:23 -06:00
1b5931a028
Mackie Protocol: fixes for aac6a5
2016-02-04 11:17:45 -06:00
37d6265e13
mackie: try to improve logic and management of device profiles
2016-02-04 11:24:26 -05:00
d3081fd816
mackie: reverse previous profile editor changes; allow profile to define anything except plain and shift actions.
...
For Fn keys we also allow plain and shift definitions
2016-02-04 11:24:26 -05:00
aefa63aaa6
mackie: radically shrink down the profile editor
...
We only expose user control over Fn keys and only the shift modifier
2016-02-04 11:24:26 -05:00
23b1944bea
Mackie protocol: set-session-from-edit-range moved to shift+marker
2016-02-04 09:30:37 -06:00
aac6a59071
Mackie Protocol: Move buttons to more accurately reflect default mcp legends.
...
Modifiers are only modifiers (no actions directly on modifiers).
Punch indicators moved to Drop/Replace.
Added Save, Undo, Cancel (select none) and Enter (select all tracks)
Fixed click button.
Up&Down buttons now move the selected track up & down.
2016-02-03 18:11:21 -06:00
10a11492dd
mackie: fix gain control display
2016-02-03 17:27:14 -05:00
eeff08aac4
mackie: use bus shortname in send subview.
...
Also slightly tighten route name display
2016-02-03 17:27:01 -05:00
7f82e7769f
zero more stuff out when leaving subview mode
2016-02-03 17:25:28 -05:00
dc4daa892d
Mackie Protocol: Show dB values for Mixbus "Send" levels.
...
No sense rewriting it now, but the correct way to approach
this stuff is to pass in the control, and use
the appropriate one of: interface, internal, or user values.
in this case, get_user would have returned dB for both Ardour and Mixbus sends.
2016-02-03 13:48:56 -06:00
9cce8d10a9
faderport: save+restore footswitch setting
2016-02-03 11:53:56 -05:00
dd05f1e257
Fix bug #5633 , Don't drop all midi bindings when a track is removed
...
Only drop the controllable that is being destroyed, not all of them.
2016-02-03 22:30:41 +10:00
0ddbf665d8
generic MIDI: if a CC is bound to a toggled controllable, toggle the controllable only when the incoming CC value > 0x40
...
See comment in code for more details
2016-02-02 22:28:36 -05:00
b4a9bf5878
Mackie Control: Save old bank before we change it to new.
2016-02-02 18:41:49 -08:00
fea89a7f9b
fix compiler warning
2016-02-02 18:30:51 -05:00
8df1baa659
Fix for previous commit
2016-02-02 16:14:00 -06:00
ea08354c17
fix for knob scaling
2016-02-02 15:47:05 -06:00
99a53ed7f0
Mackie Control: Fix Flip mode getting confused if subview is not sends.
2016-02-02 09:38:55 -08:00
7229dccb3b
Mackie Control: Shift/Select now toggles individual channels within group. Makes this the same as other grouped controls.
2016-02-02 09:03:27 -08:00
a7775559c1
Mackie Control: remove Shift/select zeros fader.
2016-02-02 08:55:36 -08:00
abb151b8b0
Mackie Control: Moved encoder fine modifier from Control to Shift (Shift will be only modifier)
2016-02-02 08:49:16 -08:00
9b1a150dd9
mackie: update fader+pot when changing flip status
2016-02-02 11:17:38 -05:00
e38fad6228
faderport: fix binding of actions to footswitch
2016-02-02 09:21:13 -05:00
846afdd8e5
faderport: make blink/on/off status of record enable LED match the GUI one
2016-02-02 09:05:00 -05:00
ff2c3dbc81
control surfaces: fix BaseUI method for disabling record enable
2016-02-02 09:03:41 -05:00
a85b8ed842
mackie: fix display of input trim level trackview mode
2016-02-02 08:15:35 -05:00
4c13018656
mackie: fix display of send level/fader level in send subview
2016-02-02 08:08:14 -05:00
36b11098a2
mackie: substantial reworking of flip mode with large chunks of code no longer used.
...
Flip mode only works in Sends subview mode.
Display is incorrect when flipped - vpot is still updated by send level changes. TO BE FIXED.
2016-02-01 22:52:22 -05:00
cf29447ec3
mackie: add Phase control (for first channel only) in Track View subview mode.
...
Also removed a couple of methods no longer used, since trim and phase are only
visible in TrackView mode.
2016-02-01 15:15:57 -05:00
f40167cb40
faderport: turn out all lights from destructor, and use Port::drain() to make sure data gets out
2016-02-01 13:27:08 -05:00
5153631d70
change API of MIDI::Port::drain() to include a maximum blocking time
2016-02-01 13:26:30 -05:00
d98021624f
mackie: stop playing games with start/end range LEDs
2016-02-01 12:22:23 -05:00
ca813315bf
mackie: add new bindings for Save,Undo,Cancel,Enter
...
these now control punch in, punch out, external sync and follow edits, respectively
2016-02-01 12:22:01 -05:00
5eccbbfbd6
mackie: fix stupid thinko, and use BaseUI::access_action() to correctly accesss GUI actions
2016-02-01 12:20:55 -05:00
c69514afe9
Mackie protocol: clear Marker modifer
2016-01-31 22:28:13 -06:00
55967972b6
mackie: slightly less fragile/more readable code for compute new controllable values from vpot events
...
This is still not really right - it doesn't do the right thing, i think, for trim controls
2016-01-31 22:43:21 -05:00
c66d7e8cf9
mackie: consistent use of Shift to mean "InverseGroup"
2016-01-31 22:42:29 -05:00
de29ed02bc
mackie: display correct numerical send level
2016-01-31 22:41:46 -05:00
20d74585fd
mackie: implement trim, monitoring, solo iso and solo safe for trackview submode
2016-01-31 21:54:01 -05:00
9cfd76c026
mackie: make shift-click use InverseGroup semantics as intended, not NoGroup
2016-01-31 21:53:29 -05:00
23f457e81e
NOOP: comment fix
2016-01-31 21:52:46 -05:00
27b565d5cc
mackie: make vselect events and pot events handle toggle/enumeration controls correctly (or more correctly
2016-01-31 21:52:14 -05:00
69b4228176
mackie: partially working trackview submode.
...
More controls/pots to come
2016-01-31 13:20:18 -05:00
da665a5dc5
mackie: fix bug that prevents global view mode from working without first banking
2016-01-31 13:20:18 -05:00
f44acc4857
mackie: fix some awful cut-n-paste errors
2016-01-31 13:20:18 -05:00
3631cc1532
mackie: remove Trim pot mode, and add skeleton for TrackView subview mode
2016-01-31 13:20:18 -05:00
d3dfd74497
mackie: strengthen behaviour of clear solo button
2016-01-31 11:36:46 -05:00
2491549923
mackie: make replace (finish-range) LED flash at the right time
2016-01-31 11:36:31 -05:00
6780b7eb54
mackie: make nudge work as modifier and on its own
2016-01-31 11:17:23 -05:00
b78be4d705
mackie: hard-code drop+replace buttons to start/finish-range-from-playhead
...
With some LED action that would even better with blinking
2016-01-31 11:02:21 -05:00
af1028bd90
mackie: make marker button work as Mackie intends it (as a modifier for rewind/ffwd)
2016-01-31 11:01:41 -05:00
2b56dc17e3
mackie: add "clean" method to invoke GUI actions from button events, in code
2016-01-31 11:00:16 -05:00
ef793d3762
mackie: shift-stop additionally requests MIDI Panic, as well as regular stop
2016-01-31 09:11:43 -05:00
e622f3e5b6
Mackie protocol: Fix stuck-on Read LED.
2016-01-30 21:38:18 -06:00
9115a2c5d2
Surfaces with separate meters should meter even when stopped.
2016-01-30 09:46:37 -06:00
f762cbff35
mackie: remove mention of "blinkers" concept
2016-01-29 18:40:56 -05:00
d5a8825ce8
mackie: basically (fully?) operation fader automatio control for first selected route
2016-01-29 18:37:03 -05:00
da35f58218
mackie: initial attempt at making automation-related buttons set fader automation state for selected routes
2016-01-29 16:29:52 -05:00
9fe4b7a92a
mackie: if a subview mode is not OK because there's no selection, show no message
2016-01-29 16:15:41 -05:00
4a6724868d
NOOP: change brace placement to avoid confusing emacs
2016-01-29 16:15:41 -05:00
42fbb96674
mackie: make group button (appear) to do something
2016-01-29 16:15:41 -05:00
9088944db2
Mackie protocol: More LED indicator fixes.
2016-01-29 14:26:08 -06:00
39a61dba83
mixbus: vpot press in non-subview mode should toggle master bus send
2016-01-29 12:58:50 -05:00
c6ea3515d1
mackie: in Sends subview mode, the enable control for the send should be looked upin the subview route, not the strip's own route
2016-01-29 12:41:50 -05:00
4b70a0aa0d
Button::AudioInstruments should not be lit without good reason.
2016-01-29 11:28:15 -06:00
0a2377e9b4
mackie: redesign display logic entirely
...
Strips now maintain a pair of pending display strings (upper and lower).
A periodic timeout writes the pending value to the actual hardware if it
differs from the current string. This new design makes it easy to put a
message on the display and then after some period of time, revert to
whatever was there before.
2016-01-29 12:27:46 -05:00
8aaa027ed3
mackie: fix Global View button function
...
Bug introduced changing logic for set_view_mode()
2016-01-28 23:20:03 -05:00
d0668e5511
mackie: don't overload "Audio Instruments" and "Instruments" buttons.
...
With the MCU Pro, the button labelled "Instruments" uses the Dyn button ID.
The one labelled "Audio Instruments" does not.
This may break Nucleus support - needs to be checked
2016-01-28 23:05:28 -05:00
e862be7300
mackie: use Route::send_name() rather than Route::nth_send()
2016-01-28 23:05:28 -05:00
f1ed01b97f
mackie: fix display of send level value
2016-01-28 23:05:28 -05:00
cf558ee18c
Buses and Auxes are slightly different view-filters in Mixbus
2016-01-28 17:21:42 -06:00
54c3c9e494
prevent bank/channel switching past the end of the available routes; do nothing when a view mode finds no matching routes
2016-01-28 16:27:33 -05:00
ea895efb97
mackie: improvements to display when switching subview modes
2016-01-28 15:08:26 -05:00
d19b1b64b1
make Send button light appropriately
2016-01-28 15:08:25 -05:00
3332633d19
Editing from a control surface must have the ability to ignore mouse location.
...
Add mark_in and mark_out actions that explicitly use the playhead as the edit location.
2016-01-28 13:46:33 -06:00
420206705d
mackie: fix subview mode logic
2016-01-27 19:05:47 -05:00
e63c805fe2
mackie: clean up (some) interactions between subview mode and selection
...
Also, stop Plugin button from doing anything, since it has nothing to do yet
2016-01-27 19:00:27 -05:00
c61e5dbc18
remove debug output
2016-01-27 16:26:50 -05:00
66686a4e2a
mackie: semi-working Sends subview mode
2016-01-27 14:15:41 -05:00
9b2af90328
remove mackie send pot mode (subview mode for sends coming up)
2016-01-27 12:41:01 -05:00
90d12b6d5a
faderport: add a few more sensible actions to the footswitch options
2016-01-25 15:11:47 -05:00
b02b6cc3cd
faderport: add footswitch combos to GUI to allow user control over what the switch does
2016-01-25 15:11:36 -05:00
5b7fa0b3c5
faderport: add footswitch button
2016-01-25 15:11:26 -05:00
2005891d40
use route gain control, not amp->gain()
2016-01-25 11:48:43 -05:00
9e5b7db89f
first compiling, mostly working version of group controls changes
2016-01-22 11:58:31 -05:00
79f0a92818
Add a link library that's now needed when building ardour_cp
...
Now needs 'Timecode::BBT_Time' (from Ardour's 'timecode' lib).
2016-01-22 12:28:01 +00:00
a7141e1fc3
Transport_play should not jump back.
...
Typical use of transport controls is to ffwd and rewind, then "play".
This doesn't work well if the Play command always resets to starting position.
2016-01-19 14:00:51 -06:00
5493e20c84
Add all_tracks_rec actions
2016-01-19 14:00:03 -06:00
fe7aac8dac
mackie: remove unnecessary connection to route group property change signal
2016-01-19 14:25:48 -05:00
fe3d85b204
Revert "mackie: still respond to route groups visibility changes"
...
This reverts commit a9ec547457
2016-01-19 14:16:49 -05:00
a9ec547457
mackie: still respond to route groups visibility changes
2016-01-19 13:38:29 -05:00
22c5cb47f7
mackie: remove changes to group activation status when fetching routes to display
...
This creates an activation loop, because we fetch new routes to display when
group active status is changed. This was done to provide individual access to
routes that are in a group. We plan to do this using a shift modifier instead.
2016-01-19 12:46:08 -05:00
ce7f7e8e00
add 10sec zoom action
2016-01-18 18:24:14 +01:00
c5b93e2a01
track scrolling and zooming
2016-01-18 18:24:14 +01:00
27d82af077
add some horz and vert zoom actions; remove some whitespace from the code of the ui-actions, so they are easier to see and maintain
2016-01-18 18:24:14 +01:00
