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
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
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
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
9e5b7db89f
first compiling, mostly working version of group controls changes
2016-01-22 11:58:31 -05: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
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
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
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
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
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
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
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
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
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
bbdd25205d
MCU: fix likely copypaste thinko in mcu panner knobs
2015-12-07 17:31:45 -06:00
3893f62657
Mackie Control: Disable Selected group in User/Selected view mode to allow individual adjustment.
2015-11-26 06:55:25 -08:00
d6186fba32
use human readable port-names in Mackie config.
2015-11-26 00:30:52 +01:00
fb96170178
Fix fader in mackie control to work with groups.
2015-11-14 10:39:53 -08:00
09672f4a50
Mackie Control: Initialize vpot assignment on start-up.
2015-11-06 19:28:24 -08:00
ace771bc91
Mackie Control: Add send functionality to vpot assign section.
2015-11-06 16:18:13 -08:00
84d44eb5a3
Don't handle possible phase change if no audio channels in mackie control
2015-11-01 19:25:45 -08:00
8ae23c6952
Fix Mackie surface phase control for flip and more than one audio channel.
2015-11-01 15:30:36 -08:00
2e9de2def0
Added Phase control mackie controls as part of the Trim (track) vpot assignment.
2015-11-01 13:35:02 -08:00
7c24957d30
Changed MCP trim detection to match method used in GUI.
2015-10-25 08:22:02 -07:00
96c6da0804
Make mackie control view mode save bank for all modes.
...
Also moved duplicated code to one function.
2015-10-22 15:30:34 -07:00
7a453d2329
Make sure Mackie Control view modes start with route 1 except Mixer mode goes to last position.
2015-10-20 19:31:04 -07:00
81f6ad0d0c
Added "Selected" view mode to Mackie Control.
2015-10-20 18:54:56 -07:00
48f91c6ef4
Add Audio Tracks and Busses too.
2015-10-18 19:55:56 -07:00
0185c9f25a
Added Midi Tracks View mode.
2015-10-18 18:13:16 -07:00
f7e3117c3b
Only display Trim for tracks that have Trim. On the way:
...
-fixed flip mode.
-fixed no controlable for vpot or fader
2015-10-18 07:38:40 -07:00
5461b50cdb
Assign Global view to get back to Mixer.
2015-10-17 16:23:46 -07:00
334cc37e1b
Reduced delay in last commit/10
2015-10-14 05:55:10 -07:00
1f85691870
fix MCP ports hang on device change and multi-surface device reconnect.
2015-10-13 22:19:36 -07:00
53a28c230a
mackie support omnibus patch
...
Fixes all kinds of miscellaneous issues with MCP. Also removes several theoretical pan modes, replace "Tracks"
pan mode with "Trim", and takes a tiny step towards view modes
2015-10-13 15:34:53 -04:00
0043dc38a3
introduce separate-meters concept for Mackie.
...
Devices like the SSL Nucleus have meters displayed separately from their 55x2 display
2015-10-13 10:04:58 -04:00
3169ac0444
fix the design of Mackie XML state management
2015-10-13 07:33:27 -04:00
fbdb4c602e
more corrections for mackie GUI layout
2015-10-13 07:33:27 -04:00
ef08cd6e4a
move incorrectly packed touch sensitivity slider for Mackie GUI
2015-10-13 07:33:27 -04:00
8e83ca5753
Only flip if not already in desired state. Fixes fader jerk on banking.
2015-10-12 13:52:10 -07:00
1eb1391cfd
expose terminal, rather than just physical, MIDI ports in Mackie GUI
2015-10-12 14:42:49 -04:00
d4e0e8e963
make MCP port buttons work
2015-10-12 13:36:22 -04:00
79113144ef
Correct wrong value on LCD strip when fader is touched (fixs #6619 from Petr Vejsada)
2015-10-11 23:24:14 -07:00
796e404819
Don't use old session connections on MCP device change, Solves crash on device change.
2015-10-11 22:27:13 -07:00
104f43ad37
Fix MCP extension number and get master on right surface.
2015-10-11 21:37:04 -07:00
f8875df18f
Several changes to Mackie support. Breaks existing Mackie state on disk but not
...
in any way that causes problems, just loss of pre-existing connectivity.
1. retain state of current device (and serialize to disk) when switching
devices, and restore that state when switching back to it.
2. fix port and surfacenaming.
3. fix bundle assembly so that all ports (for multi-surface combos) work.
4. rationalize master position numbering
5. add small sleep before starting device handshake after reconnection. This
is ugly but seems to be necessary, unfortunately.
2015-10-11 12:01:27 -04:00
6faec91dd9
Force Flip normal before Bank ( fixes #6630 )
2015-10-10 19:59:29 -07:00
7535947eb1
Display parameter that matches mode.
2015-10-10 19:40:28 -07:00
965b135842
numerous changes to Mackie support, generally offering better robustness
2015-10-10 17:14:30 -04:00
9b5a071c33
varied and wide changes to get input and output combos closer to working
2015-10-09 14:01:22 -04:00
7e771c9fdc
move location where port handling stops during Mackie::Surface destructor
2015-10-09 11:12:28 -04:00
6acd51d48e
NOOP: whitespace/indent fix
2015-10-09 11:11:36 -04:00
03018aeefb
add TrimAutomation to list of possible pot parameters for routes
2015-10-09 11:11:15 -04:00
d700576171
remove unused and useless stuff relating to bundles inside Mackie::Strip
...
What was someone (Paul? John ?) thinking?
2015-10-09 11:10:44 -04:00
9c7139e505
set up control_by_parameter map in a Mackie::Strip so that subsequent array-syntax lookup does not crash
2015-10-09 11:09:47 -04:00
6bcbace73a
add device-info specific component to Mackie GUI to allow direct wiring of MIDI ports (non-functional)
2015-10-08 21:55:38 -04:00
8338fd8ac6
add DeviceChanged signal to MCP and make surface lock mutable for use in const methods.
...
Also add nth_surface() API to MackieControlProtocol
2015-10-08 21:55:38 -04:00
36088b53b1
add new API to access AsyncMIDIPort members of Mackie Surface port
2015-10-08 21:55:38 -04:00
bda0ba173c
for an ipMIDI surface, make the GSource used for input hold the only reference on the GUIChannel.
2015-10-08 21:55:37 -04:00
7e10c21468
make Mackie::Surface keep a reference to the input source+channel and clean up in destructor
2015-10-08 21:55:37 -04:00
33fe33f268
fix initialization sequence for ipMIDI Mackie surfaces
2015-10-08 15:28:37 -04:00
0c448c387b
fix crash when switching from regular MIDI to ipMIDI Mackie surface
2015-10-08 15:28:21 -04:00
d3efef7f5c
fix logic to reshow strip "name" after a message display
2015-10-08 14:58:28 -04:00
02181174c3
remove debugging display of message on MCP device
2015-10-08 14:51:27 -04:00
