13
0
Commit Graph

130 Commits

Author SHA1 Message Date
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
2cf34cdebd MCP: look for jog wheel as a special case
git-svn-id: svn://localhost/ardour2/branches/3.0@11839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 21:22:21 +00:00
79799023f5 MCP: move init functions back into Surface since there is no difference between the BCF and MCU versions of the code at this point
git-svn-id: svn://localhost/ardour2/branches/3.0@11838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 21:17:11 +00:00
715bdc3829 MCP: remove no-longer-used files
git-svn-id: svn://localhost/ardour2/branches/3.0@11837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 21:16:16 +00:00
696f3bdda5 MCP: connect to correct signal for buttons; more code tidy; extra debugging if we can't find a control
git-svn-id: svn://localhost/ardour2/branches/3.0@11836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 20:52:45 +00:00
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
c6c98b6453 MCP: add handler for forgotten noteOn (button) messages, and more code tidying
git-svn-id: svn://localhost/ardour2/branches/3.0@11834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 20:34:21 +00:00
7296ef87a1 MCP: more debugging for fader messages
git-svn-id: svn://localhost/ardour2/branches/3.0@11833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 17:39:45 +00:00
8a1e6363da MCP: fix fader mapping from extenders
git-svn-id: svn://localhost/ardour2/branches/3.0@11832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 16:05:26 +00:00
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
66c83f2765 MCP: fix (?) interpretation of fader/pitchbend messages
git-svn-id: svn://localhost/ardour2/branches/3.0@11830 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 15:45:52 +00:00
fcada6e737 MCP: add debug tracing for fader (pitchbend) messages
git-svn-id: svn://localhost/ardour2/branches/3.0@11829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 15:16:34 +00:00
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
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
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
ef484a8a33 MCP: drop need for ScopedConnectionList::empty()
git-svn-id: svn://localhost/ardour2/branches/3.0@11825 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 14:22:34 +00:00
c72287e67d MCP: major redesign of control instantiation; continuing code reformatting
git-svn-id: svn://localhost/ardour2/branches/3.0@11824 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-08 14:11:00 +00:00
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
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
d1d164092b MCP: build fix
git-svn-id: svn://localhost/ardour2/branches/3.0@11821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-07 18:54:31 +00:00
a202b08f65 MCP: drastically alter setup of Mackie surface to not use the CSV files in anyway, reformat chunks to match coding style standards, don't throw() if part of a sysex message is message
git-svn-id: svn://localhost/ardour2/branches/3.0@11820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-07 18:43:06 +00:00
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
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
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
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
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
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
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
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
93177f4670 make mackie control header include abstract_ui.h (might help compile/link issue on OS X)
git-svn-id: svn://localhost/ardour2/branches/3.0@10250 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-20 11:44:46 +00:00
723ab60b39 Upgrade to waf 1.6.7 and autowaf r52.
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:17:54 +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
a7dc433498 Delete MIDI port objects when the MackieControlProtocol is torn down, so that it can be recreated without attempting to create duplicate JACK port names. Should fix #3886.
git-svn-id: svn://localhost/ardour2/branches/3.0@10129 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-26 20:35:16 +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
Carl Hetherington
143dddd9a7 Add a GUI to set the number of active extenders for the Mackie control surface.
git-svn-id: svn://localhost/ardour2/branches/3.0@9484 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-05 22:44:50 +00:00
Carl Hetherington
56b70dcc0b Do log/lin mapping for Mackie faders so that they behave like the on-screen ones.
git-svn-id: svn://localhost/ardour2/branches/3.0@9470 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 09:22:41 +00:00
Carl Hetherington
91d512174e Use a timeout to reset faders' in_use flags when in BCF mode (ie with faders that don't support touch).
git-svn-id: svn://localhost/ardour2/branches/3.0@9469 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 09:22:32 +00:00
Carl Hetherington
f01dc1bfd5 Fix crash on startup when using BCF mode for the mackie surface.
git-svn-id: svn://localhost/ardour2/branches/3.0@9468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 09:22:23 +00:00
Carl Hetherington
ba8a593c29 Add small GUI to select Mackie / BCF2000 emulation for the mackie surface.
git-svn-id: svn://localhost/ardour2/branches/3.0@9467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 09:22:11 +00:00
Carl Hetherington
cff8af89de Comment typo.
git-svn-id: svn://localhost/ardour2/branches/3.0@9466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-04 09:21:20 +00:00
4769db412d Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)
git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-22 22:15:21 +00:00
9850407bd9 Indent python files with spaces as per style guide.
git-svn-id: svn://localhost/ardour2/branches/3.0@9158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-16 16:32:56 +00:00
75abb09f32 remove semantic-free Panner::Changed signal; make mackie code pay attention to actual pan controls; make GUI watch PannerShell::Changed for news that the currently chosen panner has changed or changed configuration
git-svn-id: svn://localhost/ardour2/branches/3.0@8924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 18:44:22 +00:00
Carl Hetherington
49869c98f3 Prevent various things from stopping the transport by requesting a transport speed of exactly 0 when they are really just continuously varying it. Fixes strange playhead behaviour during varispeed when the user varispeeds to exactly 0 and auto-return is triggered.
git-svn-id: svn://localhost/ardour2/branches/3.0@8733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 01:12:47 +00:00
Carl Hetherington
f0177337d1 Fix up a few mackie control surface exceptions.
git-svn-id: svn://localhost/ardour2/branches/3.0@8729 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-06 18:51:35 +00:00
15b5fce904 merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 01:31:03 +00:00