13
0
Commit Graph

1098 Commits

Author SHA1 Message Date
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
16623b1cb3 add more remote transport toggles for touchOSC: midi_panic, toggle_roll, stop_forget, set_X_range, quick snapshots. also add boilerplate for monitor controls, but those are not implemented yet 2016-01-18 18:24:14 +01:00
36e1ff48bc implement mark_in, mark_out, toggle_click 2016-01-18 18:24:14 +01:00
f0d9295dd6 implement remover_marker, jump_by_bars, and jump_by_seconds 2016-01-18 18:24:14 +01:00
5a55ac582d mackie: shift-fader overrides group settings 2016-01-18 12:11:09 -05:00
c2bf0fc94e remove shift-fader-touch as a way to reset gain to default 2016-01-18 12:11:09 -05:00
746d5c6624 add API to allow mackie controls to use GroupControlDisposition 2016-01-18 12:11:09 -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
1948b50a68 working version of new gain control design 2016-01-18 12:11:08 -05:00
55094b7237 move Amp::GainControl out into its own source module and out of Amp 2016-01-18 12:11:08 -05:00
19af86ece2 Mackie Control: Fix crash in multi-surface setup when add/remove tracks. 2016-01-18 08:58:07 -08:00
ef7c6730cb Groups: Fix un/set hidden/show should reset RID for tracks involved. 2016-01-17 14:17:02 -08:00
23041fda88 Mackie Control: fix math error that tried to change bank to very high number 2016-01-16 11:17:52 -08:00
92dba5bfa3 Mackie Control: Added hidden tracks view mode. 2016-01-16 07:32:30 -08:00
9dfdaff1a4 Mackie Control: Need signal from session if group parameters change so strips redisplay if group un/hides. 2016-01-15 16:19:15 -08:00
b3fd65d149 Mackie Control: Don't show hidden groups either. 2016-01-15 13:58:08 -08:00
6b356448e3 Mackie Control: Don't show hidden routes. 2016-01-15 13:16:24 -08:00
440618b463 Add a newly introduced source file to our MSVC project (ardour_osc) 2016-01-15 11:59:43 +00:00
5f61409c90 Fix build of OSC surface caused by missing include of i18n/gettext header 2016-01-15 12:14:52 +10:00
d3ab91d171 touchOSC compat for common route operations 2016-01-15 01:31:12 +01:00
b6c78ad9c8 fix OSC debug messages 2016-01-15 01:29:44 +01:00
6a6f414fc0 OSC-debug: print argument 2016-01-15 00:57:33 +01:00
919feac5f7 use PBD instead of C++11. 2016-01-14 23:46:51 +01:00
141352341c Generic MIDI: midi controller buttons should only trigger on the PUSH, not release. This might have to be reveisited later, but it looks right to me and it fixes operation on 2 different devices here 2016-01-14 16:39:50 -06:00
ddb362fe17 Generic MIDI: add ToggleRecEnable action, and change all maps to use that instead of separate rec-enable, rec-disable, which didnt work 2016-01-14 16:37:54 -06:00
368be3585e OSC debugging, allow to log incoming & unhandled messages 2016-01-14 23:34:37 +01:00
0b58cde467 Mackie Control: Remove unused global_solo_* functions, moved functionality to clearsolo_* functions.
Changed to clear only rather than toggle and added Listen Clear as well.
2016-01-14 13:06:14 -08:00
5e4d9612e3 faderport: stop event loop when destroying object 2016-01-14 10:59:27 -05:00
b81504581b another DEBUG_TRACE for mackie control x-thread requests 2016-01-12 23:30:14 -05:00
7cbf35a3d6 Mackie Control, Fix sends after monitor not showing. 2016-01-12 08:15:57 -08:00
d134ba037d fix compilation of debug builds
ArdourSurface::FaderPort::Button::name is private
2016-01-11 11:07:09 +01:00
530dd4255c faderport: remove wierd shift use design; make user+shift work again 2016-01-10 23:32:21 -05:00
58edc83d11 tweak/add faderport debug messages 2016-01-07 16:42:57 -05:00
b456060388 OSC API update for surfaces that always send float parameters. 2016-01-04 18:18:13 +01:00
d7078df3eb amend 9e3299f for Mixbus 2016-01-03 20:39:47 +01:00
9e3299f97d change Controllable::set_value() API to include grouped control consideration.
This also removes Route::group_gain_control() and associated machinery.
Not yet tested with Mackie or other surfaces. More work to done to
start using the group capabilities, and also potentially to add
or derive more controls as RouteAutomationControls
2016-01-02 04:58:30 -05:00
b8bb3eae47 generic MIDI support does not have its own request buffer factory, so be sure to initialize descriptor member to null 2015-12-29 05:41:59 -05:00
e2f6c59639 add required request buffer factory for Wiimote 2015-12-28 11:13:04 -05:00
0d9efc1148 redesign cross-thread registration/signalling system
This new design will work even when threads that need to receive
messages from RT threads are created *after* the RT threads. The
existing design would fail because the RT thread(s) would never
be known the later created threads, and so signals emitted by the
RT thread and causing call_slot() in the receiver would end up
being enqueued using a lock-protected list. The new design ensures
that communication always uses a lock-free FIFO instead
2015-12-28 10:14:17 -05:00
85e12e8095 Mackie control: non-existent controls zero pot ring fix. 2015-12-19 11:50:13 -08:00
07e4377d7b NoOp: removed spaces, replaced with tabs. 2015-12-16 20:41:50 -08:00
82f31fe624 Mackie Control: Re-enable view_mode display and make sure all text vanishes after timeout. 2015-12-16 14:38:21 -08:00
8bb4ac0ac7 Fix MCP time display sometimes doesn't update to zero time on return to zero (shift-rew) 2015-12-16 12:24:10 -08:00
2f86d1b7dd properly namespace hacked OSC callbacks, add some notes. 2015-12-16 18:17:38 +01:00
13d704b25d redundant OSC commands to support TouchOSC and Lemur (vestigial float args) 2015-12-16 10:29:49 -06:00
bff1fcbe48 mackie: restore access to trim and pan width control
Change from Evoral::Parameter to AutomationType caused this glitch
2015-12-16 11:05:40 -05:00
3b872fb207 fix some merge issues from cherry-picking mackie changes from a mixbus repo 2015-12-16 06:31:06 -05:00
93d5fe83c8 mackie: properly track lifetime of subview route; fix subview/potmode LED state mgmt 2015-12-16 06:01:55 -05:00
a9a4cfb166 mackie: track compressor mode changes in display 2015-12-16 06:01:47 -05:00
1152bf87a2 make vselect-press in subview mode act as a toggle for toggled controls 2015-12-16 06:01:38 -05:00
a6da818bc4 add dynamics support to mackie control 2015-12-16 06:01:29 -05:00
e3d0de3bf6 mackie: use new route API for universal access to pan/eq/dynamics parameters to provide panning and EQ control 2015-12-16 06:01:20 -05:00
81179389d3 mackie: cleanup subview mode a little 2015-12-16 05:55:10 -05:00
8ba8f1c0b0 fix cherry-pick conflict 2015-12-16 05:54:43 -05:00
e302ce8662 only use 1/100th gap between markers if transport is stopped, to prevent repeated user action from adding multiple markers when stopped (mackie version) 2015-12-16 05:52:47 -05:00
a1ef99b9b7 add beginnings of EQ and dynamics control to mackie for mixbus 2015-12-16 05:52:36 -05:00
99764e946a add UserA and UserB buttons to mackie button list 2015-12-16 05:52:27 -05:00
616e925322 tentative mcu panning for mixbus. hey, it compiles 2015-12-16 05:46:52 -05:00
ff76ef86b4 faderport: long press on fader mode buttons switches fader automation to manual/off; off button is never sent an LED state message to avoid fader disabling 2015-12-14 14:42:12 -05:00
e928edca32 faderport: fix setup of periodic callback (cut-n-paste error) 2015-12-14 14:41:38 -05:00
d59739d728 faderport: add 100msec (10Hz) periodic update to facilitate automation playback 2015-12-14 13:28:31 -05:00
40a352e8a1 faderport: disable automation state button mapping until (if ever) we can figure out why it kills the fader 2015-12-14 13:28:31 -05:00
cc607fa161 fix DEBUG_TRACE messages from faderport that used MackieControlProtocol via cut-n-paste 2015-12-14 13:28:31 -05:00
634321ba45 Fix Trim control range does not match control (issue #6696) 2015-12-13 15:53:24 -08:00
29416edbbf remove debug output 2015-12-13 08:38:54 -05:00
8bdab38d43 track add/remove of monitor and/or master busses in mackie support code.
Somehow fails to move master fader to correct position when monitor section is added
2015-12-13 08:33:09 -05:00
0103de801a Mackie Control, fix timecode sometimes won't update. Do full display if transport moves faster than 800%. 2015-12-11 12:57:24 -08:00
14ef6017f6 add a few new actions to Faderport menus, and reorganize them slightly 2015-12-10 17:25:29 -06:00
548989fc75 Fix MCP send display value scaling. 2015-12-08 22:45:59 -08:00
2d03db51cd there is no "default" mackie device profile 2015-12-09 00:19:15 -05:00
014f010489 if Mackie device profile name is empty, use a default name that makes sense and that will be rediscovered on next startup 2015-12-09 00:12:28 -05:00
fcf20ee91a Set vpot to the same range as the fader. Fixes trim from -16 to -20. 2015-12-08 19:30:57 -08:00
6c99576250 faderport: stop trying to cache LED state (fixes various bugs); blink mute for muted-by-others; blink transport for speed != 1.0 && != 0 2015-12-08 11:09:50 -05:00
bbdd25205d MCU: fix likely copypaste thinko in mcu panner knobs 2015-12-07 17:31:45 -06:00
3d79e3c116 adjust generic MIDI surface support to (1) properly use boost::shared_ptr<Port> (2) detect connection changes 2015-12-07 12:38:17 -05:00
2f48997dfb remove unnecessary (?) conditional.
Given that we use "port" after the test, the test makes no sense
2015-12-07 12:38:17 -05:00
e3d2898c8d more Faderport debugging, for windows 2015-12-04 18:11:05 -06:00
0a997f62cc remove spurious printout 2015-12-04 17:32:23 -06:00
e82cc88c6f faderport: show current User button bindings in GUI 2015-12-03 21:45:41 -05:00
a9ce37b7ac faderport: fix long press behaviour, and fix ardour-only behaviour with user button when used as a modifier 2015-12-03 18:38:09 -05:00
b07d86ac61 make faderport support report its port bundles as it should 2015-12-03 12:50:32 -05:00
900f59dcde faderport: generalized blink on/off code 2015-12-03 08:36:56 -05:00
43e5d639cc Faderport: Punch indictor was being left on after blinking 2015-12-03 07:27:42 -06:00
20facc4d18 Faderport: map automation indicator LEDs 2015-12-02 20:06:29 -06:00
16a100703b GenericMidi: Partially working IO selectors.
2 remaining problems:
*  IO selectors are not updated if you change the connection outside the dialog.
*  occasional crash on the next startup, after a connection is made from the menu.
2015-12-02 19:18:22 -06:00