smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-27 08:57:41 +01:00
Code Issues Projects Releases Wiki Activity
8182 commits 103 branches 145 tags 316 MiB
Commit graph

267 commits

Author SHA1 Message Date
Paul Davis
6c52612009 merge 12954:1363 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13364 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-29 16:50:05 +00:00
Paul Davis
680ea1118c merge 13034:13103 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13107 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 14:33:56 +00:00
Paul Davis
3bb7d368a8 merge 12791:13034 from 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13105 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 00:04:51 +00:00
Paul Davis
6e824e7797 merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-28 13:30:03 +00:00
Paul Davis
14aac7e210 merge 12717:12791 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-20 03:53:34 +00:00
Paul Davis
129dcd7f97 merge 12607:12717 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12718 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-14 01:09:40 +00:00
Paul Davis
f228d2c68e merge 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-08 14:03:30 +00:00
Paul Davis
8e1db53556 merge -r12436:12545 from 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-02 16:21:08 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 19:01:24 +00:00
Paul Davis
89df06eb2d merge 3.0 12308:12389 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12391 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-23 15:41:07 +00:00
Paul Davis
d6edbf5ca2 merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-14 18:35:19 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 17:06:21 +00:00
Carl Hetherington
a4c27ff16e Update motorised button when a motorised surface's bindings are loaded. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11740 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-21 02:19:59 +00:00
Carl Hetherington
189257dd32 Make toggle MIDIControllables with program changes only respond to the appropriate program change (part of #4780). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11739 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-21 02:15:55 +00:00
Carl Hetherington
c5dac2a724 Add GPL boilerplate; use x->foo for (*x).foo; tidy some indentation; use a table to place widgets; add motorised option. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11729 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-19 01:34:40 +00:00
Carl Hetherington
8063027507 Add set_motorised(). 
git-svn-id: svn://localhost/ardour2/branches/3.0@11728 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-19 01:34:35 +00:00
Paul Davis
f07ca6397f radically rethink export/bounce/freeze code design. probably not 100% done by freeze+unfreeze now work and behave sensibly w.r.t. processors that do routing 
git-svn-id: svn://localhost/ardour2/branches/3.0@11701 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-15 21:40:17 +00:00
Carl Hetherington
fb6895ba86 Add motorised attribute to DeviceInfo for generic MIDI maps so that 
we can specify if a surface is motorised, and as such will keep its
phyiscal controls in sync with Ardour's controllables at all times.
If this is not the case, we enable the code to avoid jumps when controls and
controllables are out of sync.  Mark the BCF2000 as motorised.



git-svn-id: svn://localhost/ardour2/branches/3.0@11611 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-07 01:11:22 +00:00
Carl Hetherington
fe86f97563 Work around problems with some JACK<->ALSA midi bridges which don't 
transfer multiple MIDI messages when they are written in one
jack_midi_event_write.  Support pitch bend messages in the
generic midi control surface code.


git-svn-id: svn://localhost/ardour2/branches/3.0@11601 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-06 15:08:17 +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
dcccd5b4d6 patch from roy vegard to stop feedback from causing jumps when a MIDI controller and ardour are out of sync 
git-svn-id: svn://localhost/ardour2/branches/3.0@11001 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-14 15:57:48 +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
David Robillard
e70249ab65 Pack toolbar combo boxes with expand=false and remove size kludges. 
Turns out gtk these days sizes combo boxes with precisely enough space if
packed to not expand, none of this mess is necessary any more.


git-svn-id: svn://localhost/ardour2/branches/3.0@10790 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-23 08:35:41 +00:00
Paul Davis
47d0b88830 change several startup messages to be triggered only by -D (debug) options 
git-svn-id: svn://localhost/ardour2/branches/3.0@10281 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-22 13:30:11 +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
Paul Davis
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
Paul Davis
cb4ae53ff7 fix minor typo 
git-svn-id: svn://localhost/ardour2/branches/3.0@10249 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-10-20 11:44:04 +00:00
Paul Davis
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 17:55:14 +00:00
Paul Davis
dbc58e5653 don't build tranzport support unless it was asked for (it doesn't work anyway) 
git-svn-id: svn://localhost/ardour2/branches/3.0@10177 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 17:49:25 +00:00
Paul Davis
a6d7098797 more changes to wscript files to catch up with waf 1.6 and fix OS X issues 
git-svn-id: svn://localhost/ardour2/branches/3.0@10176 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 16:22:04 +00:00
Paul Davis
0bdb3298bb make surfaces header checks non-mandatory (for OS X) 
git-svn-id: svn://localhost/ardour2/branches/3.0@10172 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 12:12:45 +00:00
David Robillard
4ffe8418e3 Use is_defined to check for HAVE_* variables set by checks. 
Note that conf.define('FOO', 1) will NOT set conf.env['FOO'].


git-svn-id: svn://localhost/ardour2/branches/3.0@10164 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-29 20:29:06 +00:00
David Robillard
c1ef7b14a3 Remove use of waf compat15 tool. 
Always load waf tools first (prevent smashing of --debug, DATADIR, etc).


git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-29 19:58:05 +00:00
David Robillard
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
Paul Davis
6a3ce666c6 avoid compiler warnings about un-implemented MIDI functions (for now) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9997 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-16 14:20:09 +00:00
Paul Davis
ae5f278202 make control protocol's SelectByRID signal work, thus enabling MIDI binding maps to use function="select" with an argument; fix minor bug in previous commit 
git-svn-id: svn://localhost/ardour2/branches/3.0@9991 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-14 17:11:33 +00:00
Paul Davis
f75bbfd8ac track changes to config parameters for MMC device id's correctly (from roy vegard) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9985 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-13 16:27:29 +00:00
Paul Davis
0a07cca64c if a binding map specifies controllables that don't exist in the session, drop those bindings so that we don't crash from having bindings without controllables (should fix #4256) 
git-svn-id: svn://localhost/ardour2/branches/3.0@9973 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-10 15:57:03 +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