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
49be513bfa
fix rebase conflicts left over after pull
2015-10-08 13:40:00 -04:00
0cb1c7b58c
lots of changes to try to get the Mackie Control display be more useful and usable
2015-10-08 12:51:44 -04:00
4677d047a5
more mackie strip redisplay renames, and add a global block to redisplays\n
2015-10-08 12:51:18 -04:00
0f978a90f4
subtle rework/rename of per-strip revert-to-vpot-display code
2015-10-08 12:50:05 -04:00
4a1790b75e
remove unused per-surface button timer
2015-10-08 12:50:05 -04:00
6899bd7c15
Add Trim to Mackie controls.
2015-10-07 21:36:16 -07:00
c9658134ce
add button time and explicit bank switching to MCP support
2015-10-07 15:13:03 -04:00
ce9b271a92
track Mackie MIDI port connection status as primary trigger for handshake with device
2015-10-07 13:17:49 -04:00
33d614359a
only use HUI heartbeat with HUI devices
2015-10-05 12:24:15 -04:00
22b07e0233
NOOP, remove trailing tabs/whitespace.
2015-10-05 16:17:49 +02:00
4dc63966f0
globally remove all trailing whitespace from ardour code base.
...
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
a333edcb28
Initialize variable every loop so MCP devices don't accumulate too.
2015-10-03 13:15:18 -07:00
4b69495f82
Initialize variable every loop so MCP profiles don't accumulate.
2015-10-03 13:06:34 -07:00
2dddf6504b
NOOP: delete trailing whitespace
2015-10-03 14:03:29 -04:00
1e5672de98
reset IP MIDI port when deleting a mackie surface port
2015-10-03 13:51:17 -04:00
9d7b5f6df9
reset shared_ptr to master surface when clearing surfaces, to ensure Surface destructor is called
2015-10-03 13:50:59 -04:00
4403ce4bd4
make a start on providing direct choice of MIDI ports where an MCP device can be reached
2015-10-03 13:13:58 -04:00
91d3aabf53
NOOP: reformat indentation
2015-10-03 13:13:58 -04:00
76398911d4
more code-control when laying out Mackie Control GUI panel
2015-10-03 13:13:58 -04:00
6bf0d4f627
add basic support for HUI heartbeat, only used for HUI devices
2015-10-03 13:13:58 -04:00
4ef45aacc1
add DeviceType specifier for mackie devices.
...
Incomplete, because we need a way to handle multiple devices of different types
2015-10-03 13:13:58 -04:00
13765d41e3
NOOP: reformat indentation
2015-10-03 13:13:58 -04:00
c8448cb0dd
add device type to Mackie device info
2015-10-03 13:13:57 -04:00
53c47e0ccd
add support to display and set key aliases in mackie GUI
2015-10-03 13:13:57 -04:00
f0c1d58f59
fix windows compilation
2015-10-03 11:20:15 +02:00
3733fd7f31
remove undefined and unused method declaration
2015-10-02 22:08:15 -04:00
0ee737f129
another change from modifier_state() to main_modifier_state()
2015-10-02 22:08:15 -04:00
c78426968f
avoid handling pitchbend (fader) messages while SHIFT modifier is active.
...
See comment in code for more detail
2015-10-02 22:08:15 -04:00
40a4e2e6af
no longer call ::zero_all() when deleting an MCP surface object.
...
The ports required may no longer exist, and it requires a lot of messages. A reset is sent instead
2015-10-02 22:08:14 -04:00
9476657cd1
use ::main_modifier_state() in some more places
2015-10-02 22:08:14 -04:00
ef6b0bdb07
necessary header changes for new redisplay code in MCP
2015-10-02 22:08:14 -04:00
4d47760d61
add new (fast) redisplay timer that pushes parameter display text to MCP device.
...
Changes are queued in a FIFO, and pulled when a timeout in the MCP event loop fires.
2015-10-02 22:08:14 -04:00
05a8107ff6
fix comment spelling
2015-10-02 22:08:14 -04:00
2cdfeda884
use Surface::reset() when deleting MackieControlProtocol, rather than sending lots of messages.
...
This may be a bit "strong" because on the MCU Pro (at least) it causes a fader recalibration.
2015-10-02 22:08:14 -04:00
ccf505c3a2
implement backlight, fader touch sensitivity and recalibrate fader functions for MCP GUI
2015-10-02 22:08:14 -04:00
04b9df1fd9
avoid sending replicated fader set position messages
2015-10-02 22:08:14 -04:00
918133a342
fix handler of fader (pitchbend) messages in Mackie Control so that the outbound messages match the inbound ones
...
Pitch bend values really can span 0 to 16384, not 16383
2015-10-02 10:22:00 -04:00
71bf231199
allow aliasing Mackie Control buttons to other buttons
2015-10-02 10:21:20 -04:00
5c63ed589c
catch changes in click status and alter LED appropriately
2015-10-02 07:32:56 -04:00
a4fced6d63
change zoom and scrub handling to use modifier bits
2015-10-02 07:32:56 -04:00
d28c8c9bb4
spelling correction in error message
2015-10-02 07:32:56 -04:00
239da0efb5
Fix Mackie control metering ( fixes #6608 ).
2015-09-28 20:13:15 -07:00
b1424dab79
Vpot assign buttons don't do anything, don't light LEDs either.
2015-09-21 10:04:06 +02:00
47976ed4fa
Make Mackie control surface LEDs for modifier keys only light while pressed. ( fixes #6601 )
2015-09-21 10:03:56 +02:00
f8912b8b57
Made master fader touch and jog go to _master_surface instead of first surface.
2015-09-08 20:47:16 -07:00
4129b8865c
Fixed Mackie control port naming for extender use ( fixes #6500 )
2015-08-14 08:57:13 -07:00
962ba01cfd
Fixed feedback for MCP buttons and LEDs not working.
2015-08-13 13:00:04 -07:00
39240c9d37
Added end of line to debug statment
2015-08-13 09:55:32 -07:00
2a3f5d0107
Make MCP MasterPosition match MIDI port number.
2015-08-09 22:27:40 -04:00
2ea5962af2
rationalize save/restore of control surface "feedback" property
2015-06-24 13:46:07 -04:00
974e5dcc0c
Add option to mackie control profile editor to remove binding ( fixes #6301 )
2015-06-21 12:42:48 -04:00
801af5df9e
Add the new (UINTSDEFINED) preprocessor directive to all out MSVC projects (just to be on the safe side)
2015-06-09 13:18:42 +01:00
72416e9432
Don't allow user to change function of modifier buttons.
2015-06-08 17:22:34 -04:00
71ae8d2abe
Add an option in the MCP .device file to set master position ( fixes #6357 )
2015-06-04 15:07:43 -07:00
71feea97a0
Clean up mackie surface profile editor from things that don't work or match the mackie hardware ( fixes #6342 )
2015-06-04 15:02:51 -07:00
