9dc2ef28be
mackie: more debug tracing for remapped buttons
2017-01-31 17:43:33 +01:00
8f13d33efe
Revert "mackie: make profile-mapped keys maybe actually do something"
...
This reverts commit 0d7f88afbd
.
2017-01-31 17:37:45 +01:00
de189721e8
Revert "mackie: improve previous commit - use button_id not button.bid() to make remapping work"
...
This reverts commit 16804e20c8
.
2017-01-31 17:37:23 +01:00
16804e20c8
mackie: improve previous commit - use button_id not button.bid() to make remapping work
2017-01-31 17:31:10 +01:00
0d7f88afbd
mackie: make profile-mapped keys maybe actually do something
2017-01-31 17:23:45 +01:00
404686d258
more mackie debug tracing
2017-01-31 17:05:30 +01:00
1de584961a
NO-OP; Backport changes from Mixbus branch
2016-11-27 22:54:23 +01:00
cf52d6e4b4
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
2016-07-14 14:45:23 -04:00
44fcbd988c
mackie: ensure that the strip where select was pressed ends up as the first_selected_stripable
2016-07-06 21:40:29 -04:00
2047ee527c
restore/extend/simplify ControlProtocol API to allow tracking of selection
2016-07-06 13:39:10 -04:00
291aec468f
use session stripable selection API
...
and remove old ControlProtocol signals to talk to GUI etc.
2016-07-04 12:45:53 -04:00
a8d7b0fca3
redesign/reimplement selection knowledge in MackieControlProtocol object
...
strips listen to Stripable::presentation_info().PropertyChange, and forward selected status changes
to the MCP object
2016-06-12 08:19:16 -04:00
4717080aee
reduce verbosity of -D mackie in the presence of continued handshaking/keepalive messages.
2016-06-12 08:18:01 -04:00
2d4358ddb5
Various changes to PresentationInfo and a small consolidation of sorters.
...
The semantics for sorting PresentationInfo are up to the caller, not the
PresentationInfo object, so operator<() was removed and callers specifically
invoke ::order() for sorting.
2016-06-10 13:57:18 -04:00
3eaa6c0389
remove certain ControlProtocol signals related to stripable selection
...
includes change to Mackie support so that strips listen for PropertyChange
on the stripables they represent, no global selection change used anymore.
2016-06-10 13:57:18 -04:00
91ad3ef81d
don't connect to individual PresentationInfo signals per Stripable; we only reorder strips once, when the global signal arrives
2016-06-05 16:33:02 -04:00
dfcc8fd547
Stripable signals moved to PresentationInfo
2016-06-05 16:33:02 -04:00
ee0f073e8d
move from PresentationInfo::global_order() to PresentationInfo::order
2016-06-03 15:15:39 -04:00
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
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
e0ff70cf86
first vaguely working version using PresentationInfo
...
remote control ID and "order keys" have been removed.
2016-05-31 15:30:42 -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
37d6265e13
mackie: try to improve logic and management of device profiles
2016-02-04 11:24:26 -05: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
b4a9bf5878
Mackie Control: Save old bank before we change it to new.
2016-02-02 18:41:49 -08: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
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
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
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
3631cc1532
mackie: remove Trim pot mode, and add skeleton for TrackView subview mode
2016-01-31 13:20:18 -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
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
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
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
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
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
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
b81504581b
another DEBUG_TRACE for mackie control x-thread requests
2016-01-12 23:30:14 -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
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
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
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
a1ef99b9b7
add beginnings of EQ and dynamics control to mackie for mixbus
2015-12-16 05:52:36 -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
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
3893f62657
Mackie Control: Disable Selected group in User/Selected view mode to allow individual adjustment.
2015-11-26 06:55:25 -08:00
09672f4a50
Mackie Control: Initialize vpot assignment on start-up.
2015-11-06 19:28:24 -08: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
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
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
3169ac0444
fix the design of Mackie XML state management
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
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
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
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