ardour/livetrax
13
0
Fork 0
Code
15,154 Commits 1 Branch 1 Tag 157 MiB
6e912a0aa3
Commit Graph

92 Commits

Author SHA1 Message Date
Paul Davis
602e390649 changes to Mackie Control support for new crossthreadchannel implementation 2014-12-03 21:22:34 -05:00
Paul Davis
25e1eddc50 remove "port sources" management from MidiControlUI and Mackie support. 
This was necessary due to a bug/design issue between Glibmm and Glib (see https://bugzilla.gnome.org/show_bug.cgi?id=561885)
 but the problem needs to be managed by the *creator* of the IOSource and that has now moved inside CrossThreadChannel.
 2014-11-26 18:22:22 +02:00
Paul Davis
80d83fd238 add a hack to deal with device discovery race, in which the devices were not actually known to be ready before the last update_surfaces() call (which is where binding between strips and routes occurs) ; add support for Mackie Control touch on/off messages 2014-02-19 23:25:08 -05:00
Paul Davis
b0e4f81eb3 merge exportvis branch into cairocanvas, to reduce the number of "floating" branches. 
Still need to add API export/visibility macros for the canvas library.
 2013-12-27 14:29:06 -05:00
Paul Davis
362769e967 new CP API and fix several egregious bugs with port handling when switching devices, setting state etc. 2013-12-21 15:31:28 -05:00
Paul Davis
85cd647226 Mackie Control support now saves & restores port connections for devices not using ipMIDI (not required for ipMIDI anyway) 2013-12-13 16:04:34 -05:00
Paul Davis
a17bafa964 remove some unused code from mackie support 2013-12-13 16:04:34 -05:00
Paul Davis
2fab8182cc add -fvisibility=hidden to libgtkmm2ext, and make things work 2013-10-17 14:36:41 -04:00
Paul Davis
79fed95c1b tighten up error handling a little bit during various setup functions for Mackie Control 2013-09-06 10:39:14 -04:00
Paul Davis
41f6f5574b fix confusion about whether flip_mode in the Mackie support code is a bool or an enum 2013-08-24 11:46:44 -04:00
Paul Davis
99b94fad77 avoid crash when switching devices in mackie control code, add locks to protect surfaces list (hopefully done without adding any deadlocks - can't test this at present) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13750 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-31 16:04:46 +00:00
Paul Davis
3cd8138a41 convert from Glib:: to Glib::Threads for all thread-related API 
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-07-25 17:48:55 +00:00
Paul Davis
71427323ec MCP: latest patch from Rodrigo: 
* fixes Master Fader Touch button in the Mackie;
    * implements a MasterFaderTouch global button;
    * removes unused MackieControlProtocol::_transport_previously_rolling property;
    * implements DeviceInfo::get_global_button() method;
    * creates GlobalButtonsInfo and StripButtonsInfo types in DeviceInfo;
    * implements Surface::_last_master_gain_written property to help master fader feedback;
    * makes Surface respect _mcp.device_info().strip_cnt() to create master fader and when connecting signals for strips and master fader instead of using hardcoded 8;
    * removed a few unnecessary updates in Surface::turn_it_on();
    * included master_gain_changed() in Surface::periodic();
    * implemented MackieControlProtocol::master_fader_touch_press and
    * MackieControlProtocol::master_fader_touch_release;



git-svn-id: svn://localhost/ardour2/branches/3.0@12631 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-09 19:06:52 +00:00
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
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
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
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
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
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
2bae75fa0b MCP: dynamic ipMIDI ports, more default key bindings, various minor fixes 
git-svn-id: svn://localhost/ardour2/branches/3.0@12092 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-25 21:21:36 +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
40750ba0bb MCP:maybe functioning button binding stuff, plus save-to-disk-on-change (still needs naming interaction for new profile) 
git-svn-id: svn://localhost/ardour2/branches/3.0@12000 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 03:24:59 +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
bf107f93e1 MCP: no fake touch for anything, actually 
git-svn-id: svn://localhost/ardour2/branches/3.0@11989 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-16 19:08:22 +00:00
Paul Davis
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
Paul Davis
d314490797 share buttons IDs where feasible 
git-svn-id: svn://localhost/ardour2/branches/3.0@11977 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-15 13:41:20 +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
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
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
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
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
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
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
abf8069d7f MCP: loading device info files basically operational 
git-svn-id: svn://localhost/ardour2/branches/3.0@11939 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 12:58:42 +00:00
Paul Davis
3a4a45caae MCP: stubbed device info file loading 
git-svn-id: svn://localhost/ardour2/branches/3.0@11938 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 12:16:55 +00:00
Paul Davis
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
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
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
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
b3db38a34f MCP: provide basic mechanism for configuring function keys 
git-svn-id: svn://localhost/ardour2/branches/3.0@11908 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 17:13:20 +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
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
Paul Davis
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
Paul Davis
261738d01e MCP: debug tracing, plus start of a new cleaner handling system for button handling 
git-svn-id: svn://localhost/ardour2/branches/3.0@11880 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 02:54:25 +00:00
Paul Davis
f387e834fd MCP: tweak operation of most transport buttons, make save button work, start using button enums more widely 
git-svn-id: svn://localhost/ardour2/branches/3.0@11879 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 02:30:35 +00:00