smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 05:06:31 +01:00
Code Issues Projects Releases Wiki Activity
23242 commits 101 branches 145 tags 312 MiB
Commit graph

98 commits

Author SHA1 Message Date
Paul Davis
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
Len Ovens
6899bd7c15 Add Trim to Mackie controls. 2015-10-07 21:36:16 -07:00
Paul Davis
c9658134ce add button time and explicit bank switching to MCP support 2015-10-07 15:13:03 -04:00
Robin Gareus
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
Paul Davis
4dc63966f0 globally remove all trailing whitespace from ardour code base. 
Paul Davis was responsible for introducing almost all of this.
 2015-10-04 14:51:05 -04:00
Paul Davis
a4fced6d63 change zoom and scrub handling to use modifier bits 2015-10-02 07:32:56 -04:00
Len Ovens
b1424dab79 Vpot assign buttons don't do anything, don't light LEDs either. 2015-09-21 10:04:06 +02:00
Len Ovens
47976ed4fa Make Mackie control surface LEDs for modifier keys only light while pressed. (fixes #6601) 2015-09-21 10:03:56 +02: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
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
5e1ba50731 fix unsigned/signed math error 2015-05-27 08:57:16 -04:00
Paul Davis
e5c3efe9a3 ensure that Mackie Control bank left/right commands always hit the same boundary (Len Ovens) 2015-05-27 07:11:15 -04:00
Paul Davis
4512d013eb put all of the Mackie control surface code into the ArdourSurface namespace 2015-04-15 20:37:20 -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
4ecb07aaee fix up Location::first_location_(after|before) to do the right thing when marks + ranges are interleaved (functions renamed) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13869 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-01-17 13:19:16 +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
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
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
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
cafbc632fb MCP: more sensible version of previous commit, and better behaviour for play button after ffwd or rewind 
git-svn-id: svn://localhost/ardour2/branches/3.0@12101 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 21:57:47 +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
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
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
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
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
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
Paul Davis
6c9dc8f0b3 MCP: track control press/release events 
git-svn-id: svn://localhost/ardour2/branches/3.0@11933 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-12 01:14:43 +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
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
Paul Davis
d00a797461 MCP: cursor left should scroll left 
git-svn-id: svn://localhost/ardour2/branches/3.0@11923 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 22:57:01 +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
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
496a1e6965 MCP: repeated presses of play button will jump back to previous start (like GUI button) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11918 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 20:25:14 +00:00
Paul Davis
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
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
dbd6ae23d0 MCP: send nothing if LedState is none in build_led(); return none from all transport button presses 
git-svn-id: svn://localhost/ardour2/branches/3.0@11884 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-11 03:24:20 +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
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
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