ardour/livetrax
13
0
Fork 0
Code
8,744 Commits 1 Branch 1 Tag 197 MiB
a56ab30261
Commit Graph

79 Commits

Author SHA1 Message Date
Paul Davis
a56ab30261 MCP: latest patch from Rodrigo: 
* delays Mackie's led initialization until the Mackie is actually ready to receive messages;
    * at the button X function mapping customization interface in Preferences:
          o show specific device names instead of global ones;
          o mark the buttons that are actually available in the device with a *;
          o included a bottom text explaining what the * means;
    * created a DeviceInfo::get_global_button_name(Button::ID) method;
    * included several DEBUG_TRACE in mackies code;
    * renamed device buttons and groups according to the following logic: Mackie buttons are named exactly like a actual (mine) Mackie names them on the interface itself. Logic Control buttons are named exactly like they appear at Logic Pro 7.2.1 Dedicated Control Surface Support manual;
    * improved timecode display (new format);


git-svn-id: svn://localhost/ardour2/branches/3.0@12582 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-06 12:20:57 +00:00
Paul Davis
6d46299df3 MCP: another patch from rodrigo: 
* setting a (arbitraty) limit to zoom out to prevent segfaults because out of memory condition;
    * setting initial update of master fader, and read, play and stop leds on the Mackie;
    * changed the timecode display char selection for update algorithm as chars are sent one by one and not all right most;
    * implemented method of showing timecode at the mackie to better deal with the differences between Ardour's foramts and Mackie's, i.e, use spaces in place of the zeros that had no meaning;
    * preventing timecode display updates when the surface isn't yet active.


git-svn-id: svn://localhost/ardour2/branches/3.0@12541 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-02 14:51:53 +00:00
Paul Davis
ba5e71b50f MCP: Patch from Rodrigo that: 
* implements Metering on/off through Button::Read as per Seablade's suggestion. I choose this button as it's the "Show meters" button in Traktion;
    * removes redundant code from Meter::update_transport_rolling();
    * renames Meter::update_transport_rolling() to Meter::notify_metering_state_changed();
    * renamed Surface::notify_transport_state_changed() to Surface::notify_metering_state_changed();
    * renamed Strip::notify_transport_state_changed() to Strip::notify_metering_state_changed();
    * created MackieControlProtocol::notify_metering_state_changed() and made MackieControlProtocol::notify_transport_state_changed() use it;
    * implemented turning off of timecode display and two char display in Surface::zero_all ();
    * implemented master fader zeroing in Surface::zero_all ();
    * calling Surfaces->zero_all() at MackieControlProtocol destructor;
    * implemented restore of 2nd LCD line content after metering being active.



git-svn-id: svn://localhost/ardour2/branches/3.0@12520 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-01 12:56:20 +00:00
Paul Davis
28e3bc3ac7 MCP: metering changes from rodrigo, makes metering work correctly on the MC Pro (also checked on the nucleus) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12489 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-30 14:32:27 +00:00
Paul Davis
1491787cfb MCP: fix assigment of outbound sysex messages, and don't drain port->selectable() for ipMIDI devices, since this throws away all incoming data, which arrives on the same fd as port->selectable() (unlike JACK MIDI) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12483 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 23:30:13 +00:00
Paul Davis
40ef762db4 fix missing negation from previous MCP commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@12482 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 20:34:19 +00:00
Paul Davis
1d5bade8a1 patch from rodrigo severo to make mackie timecode display work 
git-svn-id: svn://localhost/ardour2/branches/3.0@12480 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 20:18:43 +00:00
Paul Davis
4d780bdcd0 provide some support for mackie devices like Steinberg's CMCs that do not do the normal Mackie spec handshaking 
git-svn-id: svn://localhost/ardour2/branches/3.0@12252 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-11 16:04:09 +00:00
Paul Davis
7b903febf9 remove debug output 
git-svn-id: svn://localhost/ardour2/branches/3.0@12229 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 18:15:58 +00:00
Paul Davis
5a7a89e068 add a (potentially temporary) discover button for mackie devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@12228 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-09 16:44:06 +00:00
Paul Davis
4235e9a1a2 a variety of mostly unused parameter errors from OS X Lion's compiler 
git-svn-id: svn://localhost/ardour2/branches/3.0@12148 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-02 20:29:46 +00:00
Paul Davis
edad92a944 control surfaces: make it possible to keep display of current GUI/selection state as we bank through tracks/bussses. note careful use of weak_ptr<Route> to avoid messing with Route lifetimes. this scheme may change 
git-svn-id: svn://localhost/ardour2/branches/3.0@12115 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-28 01:43:38 +00:00
Paul Davis
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
Paul Davis
3b7e2f7d67 MCP: properly (?) handle bank/channel scrolling with locked strips 
git-svn-id: svn://localhost/ardour2/branches/3.0@12095 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 14:28:41 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
d5e14b3d91 eventloop and abstractui debugging, lots more commenting on abstractui/eventloop implementation; minor tweaks elsewhere 
git-svn-id: svn://localhost/ardour2/branches/3.0@12076 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 16:45:38 +00:00
Paul Davis
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
Paul Davis
a9d77d1a70 remove various debugging output 
git-svn-id: svn://localhost/ardour2/branches/3.0@12070 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:35:33 +00:00
Paul Davis
33140f3267 add support for IP MIDI (multicast MIDI over IP UDP sockets) to ardour and use it if requested inside MCP code. required renaming the pre-existing MIDI::Port as MIDI:JackMIDIPort - MIDI::Port becomes the base type for both JackMIDIPort and IPMIDIPort 
git-svn-id: svn://localhost/ardour2/branches/3.0@12069 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-24 02:28:51 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
d53364f2cf MCP: gui stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@12007 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 16:21:16 +00:00
Paul Davis
d5db31f1e4 MCP: fader debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@12003 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 13:13:42 +00:00
Paul Davis
6bd6f58dee MCP: somewhat functional (?) full keybinding GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11999 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-17 21:36:48 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
65fe4f9edf new button IDs, one for MCP one for LCP, plus methods associated with them; SSL Nucleus now declares itself to be using Logic Control 
git-svn-id: svn://localhost/ardour2/branches/3.0@11976 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 13:28:45 +00:00
Paul Davis
24377e9fb2 MCP: the return of the master fader 
git-svn-id: svn://localhost/ardour2/branches/3.0@11973 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 20:38:42 +00:00
Paul Davis
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
Paul Davis
3789e7cdef MCP: hack #2 for Nucleus fader touch messages 
git-svn-id: svn://localhost/ardour2/branches/3.0@11969 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-14 01:02:40 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
5ee1aaf8d0 MCP: rename ports again, remove ports from MCP bundles, wakeup devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@11947 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 18:16:16 +00:00
Paul Davis
17b442971b MCP: more surface properties, correctly close IOSources when switching surfaces; write select button msgs one by one, change port name back to generic terms 
git-svn-id: svn://localhost/ardour2/branches/3.0@11945 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 17:52:57 +00:00
Paul Davis
0c4fe26b41 MCP: switch devices on the fly; name MIDI ports appropriately; fix active state; move sysex parsing into Surface 
git-svn-id: svn://localhost/ardour2/branches/3.0@11942 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 16:41:07 +00:00
Paul Davis
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
Paul Davis
5b34da2f96 MCP: check on whether we using pan width control; flip mode may change display 
git-svn-id: svn://localhost/ardour2/branches/3.0@11931 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 00:52:02 +00:00
Paul Davis
9c281228b3 MCP: debug continues 
git-svn-id: svn://localhost/ardour2/branches/3.0@11928 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 00:28:16 +00:00
Paul Davis
c8ea24d2f4 MCP: cursor left/right should scroll; maybe fix vpots 
git-svn-id: svn://localhost/ardour2/branches/3.0@11921 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 22:47:02 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
83c765b405 MCP: more debug traces for button press 
git-svn-id: svn://localhost/ardour2/branches/3.0@11905 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 16:24:52 +00:00
Paul Davis
b98efa7893 MCP: better debug traces for button press 
git-svn-id: svn://localhost/ardour2/branches/3.0@11903 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 16:13:05 +00:00