|
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 |
|
|
f09524b9d3
|
move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-12-14 20:28:37 +00:00 |
|
|
4b861e6039
|
Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.
git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-12-14 18:13:37 +00:00 |
|
Carl Hetherington
|
73192bc1a7
|
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-12-03 22:26:29 +00:00 |
|
Sakari Bergen
|
ea8f9cb58e
|
Removing more of using boost::shared_ptr
git-svn-id: svn://localhost/ardour2/branches/3.0@8128 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-11-29 22:39:21 +00:00 |
|
|
a8d4e33d1b
|
Fix more broken indentation (whitespace changes only).
git-svn-id: svn://localhost/ardour2/branches/3.0@8094 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-11-26 19:57:03 +00:00 |
|
|
553cf2982c
|
one step closer to working vbap panning
git-svn-id: svn://localhost/ardour2/branches/3.0@8091 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-11-26 17:43:03 +00:00 |
|
|
326d227323
|
(3.0 version) some Mackie-emulation systems (e.g. euphonix) send zero for the tick count when the jog wheel is moved, so accomodate this by pretending that they reported 1 tick
git-svn-id: svn://localhost/ardour2/branches/3.0@7907 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-10-19 15:43:05 +00:00 |
|
Carl Hetherington
|
22ffdfa6ad
|
Fix incorrect angle brackets for includes.
git-svn-id: svn://localhost/ardour2/branches/3.0@7874 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-10-05 00:25:57 +00:00 |
|
|
10bdce85a0
|
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-09-17 16:24:22 +00:00 |
|
Carl Hetherington
|
5b520324ce
|
Allow markers to be glued to bar/beat time. Fixes #1815.
git-svn-id: svn://localhost/ardour2/branches/3.0@7573 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-08-09 16:40:31 +00:00 |
|
Carl Hetherington
|
1f07948972
|
Put Mackie surface ports into the Ardour tab of the port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7522 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-30 02:09:39 +00:00 |
|
Carl Hetherington
|
21fd76ef9a
|
Fix startup of the mackie surface code.
git-svn-id: svn://localhost/ardour2/branches/3.0@7520 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-29 19:24:25 +00:00 |
|
Carl Hetherington
|
fbc946d60d
|
Fix up Mackie control surface to cope with changes to midi++ midi ports from a while back.
git-svn-id: svn://localhost/ardour2/branches/3.0@7513 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-27 03:09:58 +00:00 |
|
|
c685724c80
|
step editing now accessed via a context menu on MIDI track rec-enable buttons. along the way, fixed up confusion between set_rec_enable() and set_rec_enabled() methods in Route/Track/Diskstream
git-svn-id: svn://localhost/ardour2/branches/3.0@7482 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-24 16:40:56 +00:00 |
|
Carl Hetherington
|
4885f29be1
|
Trim midi++ port code to either do in or out, but not both in the same object.
git-svn-id: svn://localhost/ardour2/branches/3.0@7391 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-08 01:00:46 +00:00 |
|
Carl Hetherington
|
28e3215afa
|
Fix Mackie surface after port rework.
git-svn-id: svn://localhost/ardour2/branches/3.0@7388 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-07 23:47:31 +00:00 |
|
Carl Hetherington
|
ea23298f10
|
Setup fixed ports for MIDI control data; hence remove configuration of those ports. Move MIDI tracer to the Windows menu. Trim some unused code from the midi++ Manager.
git-svn-id: svn://localhost/ardour2/branches/3.0@7384 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-07 00:40:58 +00:00 |
|
Carl Hetherington
|
91850f0eb4
|
Remove non-JACK midi++ ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@7377 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-06 00:16:36 +00:00 |
|
|
14b0ca31bc
|
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big)
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-03-30 15:18:43 +00:00 |
|
|
4d33dcd5d7
|
remove near-duplicate session constructor; change names from control_outs to monitor_out and control_out to monitor_send; may havebroken creation of new sessions in a wierd way (will fix later)
git-svn-id: svn://localhost/ardour2/branches/3.0@6783 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-03-22 21:35:35 +00:00 |
|
|
db8b575c30
|
the mega-properties/SequenceProperty patch. split is broken at present (right hand starts has start-in-source of zero)
git-svn-id: svn://localhost/ardour2/branches/3.0@6718 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-03-02 00:00:00 +00:00 |
|
|
fa701b8c06
|
change PropertyChange from a bitfield into a real object, with all the many widespread changes that causes
git-svn-id: svn://localhost/ardour2/branches/3.0@6701 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-02-19 18:09:08 +00:00 |
|
|
f450df300c
|
fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2009-12-21 18:23:07 +00:00 |
|
|
96cd6c993b
|
substantial overhaul of MCU code - no more separate thread, just connect to signals on ports already listened to by the MidiUI thread in libardour (feedback is missing - needs a timeout connection); also reformat some big chunks of code to fit ardour coding style
git-svn-id: svn://localhost/ardour2/branches/3.0@6377 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2009-12-20 16:49:55 +00:00 |
|
|
aae367b63c
|
use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2009-12-19 20:26:31 +00:00 |
|