ardour/livetrax
13
0
Fork 0
Code
21,302 Commits 1 Branch 1 Tag 197 MiB
291aec468f
Commit Graph

301 Commits

Author SHA1 Message Date
Paul Davis
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
Paul Davis
ccf505c3a2 implement backlight, fader touch sensitivity and recalibrate fader functions for MCP GUI 2015-10-02 22:08:14 -04:00
Paul Davis
71bf231199 allow aliasing Mackie Control buttons to other buttons 2015-10-02 10:21:20 -04:00
Paul Davis
5c63ed589c catch changes in click status and alter LED appropriately 2015-10-02 07:32:56 -04:00
Paul Davis
a4fced6d63 change zoom and scrub handling to use modifier bits 2015-10-02 07:32:56 -04:00
Len Ovens
f8912b8b57 Made master fader touch and jog go to _master_surface instead of first surface. 2015-09-08 20:47:16 -07:00
Len Ovens
4129b8865c Fixed Mackie control port naming for extender use (fixes #6500) 2015-08-14 08:57:13 -07:00
Len Ovens
962ba01cfd Fixed feedback for MCP buttons and LEDs not working. 2015-08-13 13:00:04 -07:00
Paul Davis
2ea5962af2 rationalize save/restore of control surface "feedback" property 2015-06-24 13:46:07 -04:00
Len Ovens
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
Paul Davis
4512d013eb put all of the Mackie control surface code into the ArdourSurface namespace 2015-04-15 20:37:20 -04:00
Robin Gareus
40c04867ef Bundle API user update 
cherry-pickable follow up to 0582221
 2015-03-08 22:39:34 +01:00
Paul Davis
d3e2de8b4e modify Mackie surface code to use crossthreadchannel on all platforms 2014-12-03 20:57:58 -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
bfe49540b9 remove use of CrossThreadChannel::selectable() to allow cross-platform implementation of CrossThreadChannel via Glib::IOSource 2014-11-23 17:37:13 +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
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -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
f6c9fa4d89 fix a crash caused by not checking if MackieControlProtocol::_surfaces_state exists 
I forgot to add this check when i changed the member variable to a pointer.
 2013-12-14 11:10:54 -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
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00
Paul Davis
f6ba1d2271 fix signed/unsigned issue pointed out by old apple gcc 2013-10-15 10:58:46 -04:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -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
John Emmas
f225eaa919 'surfaces/mackie' - Platform specific changes 2013-09-05 10:04:18 +01:00
Paul Davis
d074bc586e Merge branch 'master' into audioengine 2013-09-03 17:41:49 -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
9ac6bb9bef part-way through getting the audioengine changes to compile 2013-07-24 19:29:45 -04:00
Paul Davis
cd6cbba299 rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit 2013-04-06 16:04:02 -04:00
Paul Davis
8f091de64b for MCP devices that don't handshake, turn them on as soon as we call ::connectivity_established() so that _active == true, and we will actually write to them 
git-svn-id: svn://localhost/ardour2/branches/3.0@14165 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-06 20:15:28 +00: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
104da317ff avoid crashing in a wierd case (possibly a race) in Mackie support 
git-svn-id: svn://localhost/ardour2/branches/3.0@13749 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-31 15:27:38 +00:00
Carl Hetherington
d341088f13 Fix some uninitialised variable warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12702 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-13 15:38:15 +00:00
Rodrigo Severo
1bd34a34f7 Small change to Timecode display (SMTPE) in the Mackie. 
git-svn-id: svn://localhost/ardour2/branches/3.0@12694 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-13 03:09:46 +00:00
Rodrigo Severo
335bf3d21e Prevents a master fader being created without a control at Surface::setup_master_fader; 
Several DEBUG_TRACE changes to help identify race conditions;

git-svn-id: svn://localhost/ardour2/branches/3.0@12693 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-13 03:07:50 +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
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
bbcfffc2da revert part of earlier MCP patch from rodrigo 
git-svn-id: svn://localhost/ardour2/branches/3.0@12534 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-01 21:25:12 +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
cd58caa93b MCP: remove misleading and confusing and out of date comment 
git-svn-id: svn://localhost/ardour2/branches/3.0@12485 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-30 00:01:15 +00:00
Paul Davis
28aed9e0d1 MCP: correct display of timecode 
git-svn-id: svn://localhost/ardour2/branches/3.0@12484 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-29 23:44:34 +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
d7a32eb85e MCP: remember to drain the x-thread FIFO that tells us that JACK MIDI data has been received 
git-svn-id: svn://localhost/ardour2/branches/3.0@12453 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-27 10:57:36 +00:00
Paul Davis
60904be8ef fully tear down Mackie GUI when disabling mackie 
git-svn-id: svn://localhost/ardour2/branches/3.0@12258 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-12 14:12:51 +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
d1af0b89a8 MCP: failure to rebank for cases where num_routes < num_strips but we're not on bank 0 
git-svn-id: svn://localhost/ardour2/branches/3.0@12112 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-27 20:35:45 +00:00
Paul Davis
ae2e8c6765 MCP: ctrl-select toggle selections status, analogous to GUI op 
git-svn-id: svn://localhost/ardour2/branches/3.0@12102 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 22:10:32 +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
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
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
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
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
95f5c3cc80 MCP: some button handling fixes 
git-svn-id: svn://localhost/ardour2/branches/3.0@12019 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 21:34:15 +00:00
Paul Davis
260db68a69 update timecode/position display where appropriate 
git-svn-id: svn://localhost/ardour2/branches/3.0@12015 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 18:27:06 +00:00
Paul Davis
56281ba906 MCP: gui changes; more debugging for button bnding lookup 
git-svn-id: svn://localhost/ardour2/branches/3.0@12002 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-18 12:20:28 +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
e36aa889eb MCP: off by one error 
git-svn-id: svn://localhost/ardour2/branches/3.0@11967 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 22:10:41 +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
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
Paul Davis
9502fa261d MCP: more button tracing, more config stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@11963 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 19:17:28 +00:00
Paul Davis
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
Paul Davis
2329be8f6c MCP: fix uninitialized variable; start work on extending MCP gui 
git-svn-id: svn://localhost/ardour2/branches/3.0@11961 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-13 17:06:35 +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
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
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
cd78f52bd8 missing initialization 
git-svn-id: svn://localhost/ardour2/branches/3.0@11944 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 16:57:34 +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
96d4ba88d1 MCP: more tracing for rewind; change play LED illumination rule 
git-svn-id: svn://localhost/ardour2/branches/3.0@11919 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 20:48:51 +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
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
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
Paul Davis
220095b8e0 MCP: use goto-visual-state-N as default function key bindings 
git-svn-id: svn://localhost/ardour2/branches/3.0@11909 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 17:18:32 +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
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
Paul Davis
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
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
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
Paul Davis
0b69a2d3e1 MCP: slightly cleaner code for button map definition 
git-svn-id: svn://localhost/ardour2/branches/3.0@11883 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 03:18:35 +00:00
Paul Davis
72719ba1b6 MCP: actually build button map 
git-svn-id: svn://localhost/ardour2/branches/3.0@11882 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 03:13:19 +00:00
Paul Davis
fa638e5e98 MCP: fix n_strips() count; new button dispatch scheme 
git-svn-id: svn://localhost/ardour2/branches/3.0@11881 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 03:11:56 +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
Paul Davis
f03ff886c9 remove debugging output, and fix MCP to use MISSING_INVALIDATOR to stop crash on close 
git-svn-id: svn://localhost/ardour2/branches/3.0@11878 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 00:10:31 +00:00
Paul Davis
aa22f85c1b MCP: fix fader touch button IDs; remove last traces of MidiControlUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11873 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-10 17:26:31 +00:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
ac7ade93bd MCP: make rightward bank shift work, and add a flag for scrub mode; more code rearrangement 
git-svn-id: svn://localhost/ardour2/branches/3.0@11860 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 19:47:06 +00:00
Paul Davis
bef3ea1adc MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights 
git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 18:53:51 +00:00
Paul Davis
0431309f89 MCP: shift-select resets gain to unity 
git-svn-id: svn://localhost/ardour2/branches/3.0@11856 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 17:56:20 +00:00
Paul Davis
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
Paul Davis
62afe207d2 MCP: register thread with GUI and create session event pool 
git-svn-id: svn://localhost/ardour2/branches/3.0@11853 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 16:26:44 +00:00
Paul Davis
57a046804c MCP: different meter debug trace; initial support for track selection 
git-svn-id: svn://localhost/ardour2/branches/3.0@11852 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 16:15:55 +00:00
Paul Davis
e2d62d9af4 allow ControlProtocols to call for undo/redo in GUI; make MCP use this 
git-svn-id: svn://localhost/ardour2/branches/3.0@11851 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 15:50:38 +00:00
Paul Davis
5d0858940b MCP: zoom button toggles led 
git-svn-id: svn://localhost/ardour2/branches/3.0@11850 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 15:41:37 +00:00
Paul Davis
9f5a9a2447 MCP: zoom in on cursor right press 
git-svn-id: svn://localhost/ardour2/branches/3.0@11849 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 15:40:21 +00:00
Paul Davis
2b659deaef remove redundant MackieButtonHandler class, implement initial zoom support for cursor left + right buttons 
git-svn-id: svn://localhost/ardour2/branches/3.0@11847 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 15:32:25 +00:00
Paul Davis
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
Paul Davis
63e15e1737 MCP: change refresh interval for meters + automation + timecode to 100msec 
git-svn-id: svn://localhost/ardour2/branches/3.0@11845 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 00:45:22 +00:00
Paul Davis
522c2dd4cf MCP: add some locking to the RouteSignals object 
git-svn-id: svn://localhost/ardour2/branches/3.0@11844 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 00:32:13 +00:00
Paul Davis
7ab25511b5 MCP: possible support for metering (really) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11843 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-09 00:03:58 +00:00
Paul Davis
0e0c4277cf MCP: start up event loop (thread) so that we can do timeouts and metering; start of Meter control support 
git-svn-id: svn://localhost/ardour2/branches/3.0@11840 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 23:14:36 +00:00
Paul Davis
6315a979a1 MCP: remove files no longer used (copies are always available in 2.0-ongoing for historical purposes) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11835 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 20:44:36 +00:00
Paul Davis
5d29d591b8 debug ardour->MCP fader mapping 
git-svn-id: svn://localhost/ardour2/branches/3.0@11831 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 15:51:30 +00:00
Paul Davis
0e72a29bcc MCP: add debug tracing for timeouts 
git-svn-id: svn://localhost/ardour2/branches/3.0@11828 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 15:13:12 +00:00
Paul Davis
733a2b1820 MCP: correctly link routes and strips; correctly set up timeouts using event loop of MCP, not GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11827 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 15:10:46 +00:00
Paul Davis
6e13711361 MCP: stop using signals to handle parsed control events; add debugging 
git-svn-id: svn://localhost/ardour2/branches/3.0@11826 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-08 14:51:14 +00:00
Paul Davis
05b36d0092 MCP: fix bad use of strips container 
git-svn-id: svn://localhost/ardour2/branches/3.0@11823 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 19:30:00 +00:00
Paul Davis
f703a3cfd1 MCP: alternative method for clearing route table when switching banks 
git-svn-id: svn://localhost/ardour2/branches/3.0@11822 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 19:08:57 +00:00
Paul Davis
9cdeaa30b9 MCP: try to fix madness with extender strip indices 
git-svn-id: svn://localhost/ardour2/branches/3.0@11819 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 16:04:13 +00:00
Paul Davis
1e1ceaba7e MCP: try to actually use extenders 
git-svn-id: svn://localhost/ardour2/branches/3.0@11818 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 15:22:22 +00:00
Paul Davis
785082b2da debugging mcu via ssl nucleus 2 
git-svn-id: svn://localhost/ardour2/branches/3.0@11817 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 14:48:44 +00:00
Paul Davis
1f26ba1688 debugging mcu via ssl nucleus 
git-svn-id: svn://localhost/ardour2/branches/3.0@11816 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-07 14:16:08 +00:00
Paul Davis
355183f1ab partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing 
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-06 16:39:40 +00:00
Paul Davis
e9b4f14668 rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The number doesn't describe the smallest division of a "beat" (which is only defined contextually anyway), but rather the smallest division of the the divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and we can divide each one into ticks_per_bar_division pieces; in a separate meter (section) of 3/8, there are 3 divisions per bar, each of which can be divided into ticks_per_bar_division_pieces. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-19 19:44:43 +00:00
Paul Davis
e0cf3b6354 more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects 
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-13 02:46:36 +00:00
Paul Davis
dbcef630d0 include abstract_ui.cc in mackie source to actually instantiate the AbstractUI template 
git-svn-id: svn://localhost/ardour2/branches/3.0@10251 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-20 11:56:21 +00:00
Carl Hetherington
2206a60a10 Fix crash on close after Mackie modifications by making it use AbstractUI so that invalidation of signals works properly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10138 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-27 00:43:04 +00:00
Carl Hetherington
daf5203f58 Fix crash on startup caused by previous Mackie commits. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10137 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 23:18:59 +00:00
Carl Hetherington
f349b4010d No-op; formatting tidy-ups. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10136 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 22:32:24 +00:00
Carl Hetherington
1145f1ff6c Update Mackie surface state when something is connected to its output port (#3887). 
git-svn-id: svn://localhost/ardour2/branches/3.0@10135 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-26 22:22:21 +00:00
Carl Hetherington
32df620938 Fix a few missing drops of Route references. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9571 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-23 10:03:14 +00:00
Carl Hetherington
7633066406 Fix compiler warning. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9493 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-05-11 15:57:49 +00:00