13
0
Commit Graph

126 Commits

Author SHA1 Message Date
ab8ebe97bb MCP: fix handling of vpot presses
git-svn-id: svn://localhost/ardour2/branches/3.0@12100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 21:22:36 +00:00
834f94c60a fix initialization of control protocols so that brand new sessions get working control protocols if the user's ardour.rc file indicates to do so; fix MCP bank scrolling
git-svn-id: svn://localhost/ardour2/branches/3.0@12096 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 16:18:03 +00:00
ec97b8e58d MCP: lots of good stuff - recenable bug fixed, cursor keys for vertical scroll work, loop button lights/unlightspan pots don't adjust if there is no panner, etc.
git-svn-id: svn://localhost/ardour2/branches/3.0@12093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 03:46:18 +00:00
b31400207e MCP: various fixes, plus removal of ui_bind() (just for mackie code)
git-svn-id: svn://localhost/ardour2/branches/3.0@12086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 04:42:01 +00:00
0c026a6dc5 MCP: remove debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@12073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-24 03:18:16 +00:00
954b022e19 MCP: remove debugging related to selection that turned out to be about some JACK/IP MIDI layer
git-svn-id: svn://localhost/ardour2/branches/3.0@12071 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-24 02:41:07 +00:00
4bfdcc18bd ControlProtocol doesn't actually need any record of an event loop and doesn't need to connect to any signals itself
git-svn-id: svn://localhost/ardour2/branches/3.0@12063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-23 10:54:34 +00:00
ac1b2a6647 MCP: another bevy of changes, including working jog wheel
git-svn-id: svn://localhost/ardour2/branches/3.0@12056 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-22 17:37:52 +00:00
82c867bf2a MCP: a fistful of improvements. probably best to just try it and see what it broken. KNOWN: pressing vpots without a bank/channel shift will crash ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@12053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-22 02:15:24 +00:00
Carl Hetherington
9befa88deb Fix some warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@12048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-20 23:34:15 +00:00
c7c9c1bd26 MCP: next try at vpot mode for pan width
git-svn-id: svn://localhost/ardour2/branches/3.0@12013 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 17:34:31 +00:00
e9dcd14bb4 MCP: bettetr vpot mode for pan width
git-svn-id: svn://localhost/ardour2/branches/3.0@12012 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 17:05:13 +00:00
028727e85c MCP: space for %
git-svn-id: svn://localhost/ardour2/branches/3.0@12011 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 17:03:21 +00:00
3cc358bc87 MCP: missing break
git-svn-id: svn://localhost/ardour2/branches/3.0@12010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 17:01:02 +00:00
e06620280b MCP: maybe fix vpot display behavior for pan width
git-svn-id: svn://localhost/ardour2/branches/3.0@12009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 16:52:38 +00:00
adbfd1b262 MCP: maybe fix vpot behaviour as seen with pan width
git-svn-id: svn://localhost/ardour2/branches/3.0@12008 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 16:26:43 +00:00
7a2c0b9d9a MCP: maybe really fix fader dB display
git-svn-id: svn://localhost/ardour2/branches/3.0@12006 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 14:48:37 +00:00
3620530e62 MCP: maybe fix fader dB display
git-svn-id: svn://localhost/ardour2/branches/3.0@12005 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 14:24:00 +00:00
b253f464a5 MCP: more fader debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@12004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-18 13:36:26 +00:00
b9ff443085 MCP: various work on the button binding GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11997 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-17 20:41:31 +00:00
0078582a5f MCP: work on rec-enable
git-svn-id: svn://localhost/ardour2/branches/3.0@11993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 22:33:09 +00:00
b5276aa4ab MCP: work on vpots
git-svn-id: svn://localhost/ardour2/branches/3.0@11992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 22:30:38 +00:00
e3d353715a MCP: bit more debugging for vpot press
git-svn-id: svn://localhost/ardour2/branches/3.0@11991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 21:01:59 +00:00
4da123458e MCP: no fake touch for vpot
git-svn-id: svn://localhost/ardour2/branches/3.0@11988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 19:07:37 +00:00
72d17d326e MCP: a fistful of changes
git-svn-id: svn://localhost/ardour2/branches/3.0@11987 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 19:05:27 +00:00
02c498a8fa MCP: make v-pot press work; work ongoing on general keybindings
git-svn-id: svn://localhost/ardour2/branches/3.0@11985 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-16 13:06:39 +00:00
bef36b6f65 cmd-press on vpot should lock strip; shift-press resets pot param to default
git-svn-id: svn://localhost/ardour2/branches/3.0@11980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-15 15:43:25 +00:00
97c2832d35 MCP: probably fix issues with vpots not working
git-svn-id: svn://localhost/ardour2/branches/3.0@11979 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-15 14:30:03 +00:00
2ed2b61224 MCP: redesign to allow device-specific button IDs, since we know that at least one device (nucleus) does not honor mackie's specification document
git-svn-id: svn://localhost/ardour2/branches/3.0@11972 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-14 19:02:54 +00:00
32766ce215 MCP: hack test for ssl nucleus fader touch
git-svn-id: svn://localhost/ardour2/branches/3.0@11970 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-14 11:39:25 +00:00
e240fb16bd MCP: hack for Nucleus fader touch messages
git-svn-id: svn://localhost/ardour2/branches/3.0@11968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 22:49:58 +00:00
69830c477e MCP: catch noteOff to see note-on+velocity=zero messages; more GUI tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@11966 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 21:46:26 +00:00
565be46ea1 MCP: more of the same
git-svn-id: svn://localhost/ardour2/branches/3.0@11965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 20:39:59 +00:00
ae09d046c1 MCP: better display of parameter values, off by one error when collecting controls for buttons, more GUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11964 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 20:27:08 +00:00
411e2536c2 MCP: more button tracing, more config stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@11962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 17:58:36 +00:00
8f7fa7d93b MCP: timeout display of value when altering with fader or pot; range ops on strip buttons should work; select logic may be broken
git-svn-id: svn://localhost/ardour2/branches/3.0@11959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 16:11:55 +00:00
f511b7cc6b show gain level as its adjusted from ardour GUI (not reverted back); basic support for select/solo/mute/recenabel range ops, but not functioning yet
git-svn-id: svn://localhost/ardour2/branches/3.0@11958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 03:46:38 +00:00
13699251d9 convert rec-enable control for a Track from PBD::COntrollable to ARDOUR::AutomatioNControl, and use in MCP
git-svn-id: svn://localhost/ardour2/branches/3.0@11956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 00:35:42 +00:00
d7595f71be MCP: make select button work again
git-svn-id: svn://localhost/ardour2/branches/3.0@11955 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 23:46:17 +00:00
5f1251edd7 MCP: try an alternate mode for gain pot mode
git-svn-id: svn://localhost/ardour2/branches/3.0@11954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 23:02:12 +00:00
d84fedac0a MCP: button debugging, plus don't do much/aything on button release
git-svn-id: svn://localhost/ardour2/branches/3.0@11953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 22:59:26 +00:00
f04b55af3a MCP: display label change
git-svn-id: svn://localhost/ardour2/branches/3.0@11952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 22:17:58 +00:00
454359a321 MCP: reverse pot labelling re: flip mode
git-svn-id: svn://localhost/ardour2/branches/3.0@11951 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 22:16:01 +00:00
939801a8d8 MCP: start generalizing mapping between surface controls and ARDOUR::AutomationControl; simplify flip mode; more good stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@11949 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 21:02:43 +00:00
b4235221ab remove old mcp config params, use new one
git-svn-id: svn://localhost/ardour2/branches/3.0@11948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 18:36:14 +00:00
62620122a9 propagate GUI track selection to control protocols; make MCP update when GUI track selection changes
git-svn-id: svn://localhost/ardour2/branches/3.0@11941 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 14:34:03 +00:00
f991e11b77 MCP: shift-select resets gain to unity; don't jump back to last transport start unless playing normally; footswitch 1 and 2 do play/stop
git-svn-id: svn://localhost/ardour2/branches/3.0@11934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 01:51:57 +00:00
dd81c77161 MCP: probably fix crash from flip mode, and debug modifier state in pothandler
git-svn-id: svn://localhost/ardour2/branches/3.0@11932 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 01:05:18 +00:00
ac284a4ea1 MCP: check on whether we using pan width control
git-svn-id: svn://localhost/ardour2/branches/3.0@11930 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 00:50:18 +00:00
cf6d8b0e67 MCP: probably fix ardour->surface for faders
git-svn-id: svn://localhost/ardour2/branches/3.0@11929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 00:45:11 +00:00
d5a5c66d46 MCP: debug continues
git-svn-id: svn://localhost/ardour2/branches/3.0@11927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-12 00:27:25 +00:00
1aa8baf6f9 MCP: maybe get vpot id's right; more debug tracing for gain notify
git-svn-id: svn://localhost/ardour2/branches/3.0@11926 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 23:52:37 +00:00
d96edb4dcb MCP: hopefully fix ardour->controller for faders
git-svn-id: svn://localhost/ardour2/branches/3.0@11922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 22:50:21 +00:00
bc52377c3e MCP: reverse operation of cursor up/down in zoom mode; more tracign for vpot
git-svn-id: svn://localhost/ardour2/branches/3.0@11920 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 22:32:02 +00:00
5ae258e23b MCP: share add-marker code with BasicUI; don't allow route locking if the strip has no current route
git-svn-id: svn://localhost/ardour2/branches/3.0@11916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 20:18:01 +00:00
b2cd8b004c MCP: make BasicUI::rewind() behave symmetrically to BasicUI::ffwd(); basics of route locking and an API to put the master/monitor on a strip
git-svn-id: svn://localhost/ardour2/branches/3.0@11915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 20:10:10 +00:00
c0bdc7f31e MCP: fix missing message when setting a button(led) to its current state; more view mode stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@11914 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 19:47:41 +00:00
1ce39cfb25 MCP: more view mode stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@11913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 19:27:13 +00:00
f40d6b6440 MCP: more view mode support, use 6 bits for pot information, more mute debug trace
git-svn-id: svn://localhost/ardour2/branches/3.0@11912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 19:16:49 +00:00
5097af6a13 MCP: start adding different view modes and support for Flip
git-svn-id: svn://localhost/ardour2/branches/3.0@11911 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 18:51:01 +00:00
21f038c280 MCP: more mute button debug tracing; fix action for fn keys
git-svn-id: svn://localhost/ardour2/branches/3.0@11910 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 17:34:04 +00:00
337b420266 MCP: rename raw_id() to id(); add missign modifier_state() function
git-svn-id: svn://localhost/ardour2/branches/3.0@11907 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 16:31:23 +00:00
20d38b1c25 MCP: make vpots control pan width + direction/position
git-svn-id: svn://localhost/ardour2/branches/3.0@11904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 16:21:23 +00:00
1554e9ad9e MCP: more twiddling with code
git-svn-id: svn://localhost/ardour2/branches/3.0@11902 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 16:11:55 +00:00
753096ec18 MCP: probably fix crash on solo, another debug trace
git-svn-id: svn://localhost/ardour2/branches/3.0@11901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 15:50:02 +00:00
8c9f9e746b MCP: further objectification of event handling code
git-svn-id: svn://localhost/ardour2/branches/3.0@11896 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 13:39:25 +00:00
02c8ccf348 move all code to construct MIDI messages into relevant Control/Strip/Surface object; remove MackieMidiBuilder
git-svn-id: svn://localhost/ardour2/branches/3.0@11895 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 13:03:41 +00:00
7c9c4d6dc7 MCP: breakout Led class code; remove builder code for Led changes and put it into Led::set_state() which returns the (possibly empty) MIDI data needed to go back to the MCP device to change the LED visible state
git-svn-id: svn://localhost/ardour2/branches/3.0@11886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-11 04:02:46 +00:00
01c1eeb279 give MackieControlProtocol its own thread and make it parse incoming MIDI in that thread, as well as doing timeouts there too
git-svn-id: svn://localhost/ardour2/branches/3.0@11872 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 17:13:55 +00:00
a8094bb49c MCP: debug tracing
git-svn-id: svn://localhost/ardour2/branches/3.0@11870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 16:02:34 +00:00
f89d0ea069 MCP: debug tracing
git-svn-id: svn://localhost/ardour2/branches/3.0@11869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 15:59:43 +00:00
43a6662357 MCP: actually map routes to strips, more debug tracing
git-svn-id: svn://localhost/ardour2/branches/3.0@11865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 15:13:37 +00:00
fb4816f010 MCP: fix build
git-svn-id: svn://localhost/ardour2/branches/3.0@11862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 14:32:30 +00:00
5ace191bff drastic, fundamental redesign of MCP code
git-svn-id: svn://localhost/ardour2/branches/3.0@11861 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-10 14:27:44 +00:00
db5258fea3 MCP: maybe handle multiple MCUs better; add support for modifier keys; rearrange source so that all button handlesr are in mcp_buttons.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@11855 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 17:48:16 +00:00
f02edae438 start breaking apart the various controls into their own headers and source code, and making each control know how to generate MIDI; throttle delivery of meter data and get meter ID right
git-svn-id: svn://localhost/ardour2/branches/3.0@11846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 13:59:35 +00:00