13
0
Commit Graph

4745 Commits

Author SHA1 Message Date
Carl Hetherington
e59090cac0 Add missing file.
git-svn-id: svn://localhost/ardour2/branches/3.0@7400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 01:15:26 +00:00
Carl Hetherington
876a8547e4 Send both MTC and MMC locates on auto-return. Should fix #3303.
git-svn-id: svn://localhost/ardour2/branches/3.0@7399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 00:58:28 +00:00
Carl Hetherington
c1dafd7c0e Fix playhead behaviour on auto-return if follow playhead is not set.
git-svn-id: svn://localhost/ardour2/branches/3.0@7398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 00:58:20 +00:00
Carl Hetherington
00cf0733a1 Remove some unused transport sub state enums.
git-svn-id: svn://localhost/ardour2/branches/3.0@7397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 00:57:58 +00:00
Carl Hetherington
01c78d5620 Give internal edit mode its own cursor. Deselect everything when entering internal edit, and don't allow region selection during internal edit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7396 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 00:57:22 +00:00
Carl Hetherington
4dc475776d Move all sync in / out options out of the menus and into the options dialogue.
git-svn-id: svn://localhost/ardour2/branches/3.0@7395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 00:56:52 +00:00
Carl Hetherington
648a169d8f Move MIDI control port ownership into the MIDI Manager, since control port state should be Ardour-wide, not per-session. Fix up port connection state management.
git-svn-id: svn://localhost/ardour2/branches/3.0@7394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 22:55:20 +00:00
Carl Hetherington
3549189f87 Send MTC/MMC on the initial playhead grab as well as on subsequent movement.
git-svn-id: svn://localhost/ardour2/branches/3.0@7393 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 01:26:33 +00:00
Carl Hetherington
c546ad359a Allow multiple MIDI tracer windows.
git-svn-id: svn://localhost/ardour2/branches/3.0@7392 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 01:21:22 +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
a15bdfc6d9 Trace MTC more nicely.
git-svn-id: svn://localhost/ardour2/branches/3.0@7390 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-07 23:49:29 +00:00
Carl Hetherington
10ef65b696 Transmit MTC on playhead drag, as per #3239.
git-svn-id: svn://localhost/ardour2/branches/3.0@7389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-07 23:48: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
6cccf3ce7d group active status honor patch from lincoln spiteri
git-svn-id: svn://localhost/ardour2/branches/3.0@7382 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 11:34:00 +00:00
2f9184d653 beat slicing patch #1 from lincoln spiteri
git-svn-id: svn://localhost/ardour2/branches/3.0@7381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 11:33:27 +00:00
Taybin Rutkin
2f11b367ca fix compiling file_manager.cc on osx
clock_gettime() and CLOCK_MONOTONIC aren't implemented on osx.
Replaced with get_absolute_time() as suggested here:
http://www.wand.net.nz/~smr26/wordpress/2009/01/19/monotonic-time-in-mac-os-x/



git-svn-id: svn://localhost/ardour2/branches/3.0@7380 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 01:25:06 +00:00
Carl Hetherington
d3b422d064 Remove file that should have gone earlier.
git-svn-id: svn://localhost/ardour2/branches/3.0@7379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 01:18:14 +00:00
Carl Hetherington
ff8ea4d2f2 Remove MMC thread protection which is pointless now that only JACK MIDI ports are used for output, which themselves can cope with multi-threaded access.
git-svn-id: svn://localhost/ardour2/branches/3.0@7378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-06 00:27:03 +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
dc1e5d09a2 require jack 0.118.2 for weakjack.h
git-svn-id: svn://localhost/ardour2/branches/3.0@7375 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 16:28:45 +00:00
c9f471b404 require jack 0.118.2 for weakjack.h
git-svn-id: svn://localhost/ardour2/branches/3.0@7374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 16:28:30 +00:00
Carl Hetherington
df2298c846 Reestablish libmidi++ JACK ports on jack reconnection, so that control MIDI can still be sent after a JACK disconnect/reconnect. Fixes remainder of #3301.
git-svn-id: svn://localhost/ardour2/branches/3.0@7373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 15:41:05 +00:00
Carl Hetherington
c686dee0ce Set entered_regionview on entry into region view canvas item children. Should fix #3300.
git-svn-id: svn://localhost/ardour2/branches/3.0@7372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:55:07 +00:00
Carl Hetherington
839402778f Prevent assertion failure if _jack_output_port is 0, which can happen if JACK is disconnected. Improves #3301.
git-svn-id: svn://localhost/ardour2/branches/3.0@7371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:13:52 +00:00
Carl Hetherington
c36132271b Do MMC on playhead drag more efficiently by not doing an actual locate.
git-svn-id: svn://localhost/ardour2/branches/3.0@7370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:13:36 +00:00
Carl Hetherington
8216700080 Fix possible problems with _pending_locate_request getting stuck at true and hence stopping playhead movement.
git-svn-id: svn://localhost/ardour2/branches/3.0@7369 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:13:18 +00:00
Carl Hetherington
dc44037a51 Forward port no-process-after-export fix from 2.X revs 7357 and 7361.
git-svn-id: svn://localhost/ardour2/branches/3.0@7368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:13:03 +00:00
Carl Hetherington
e4c6b5f01a Fix up route group label updates.
git-svn-id: svn://localhost/ardour2/branches/3.0@7367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:12:49 +00:00
Carl Hetherington
46d2e5e2b4 Zero-pad MMC timecodes in MIDI traces.
git-svn-id: svn://localhost/ardour2/branches/3.0@7366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-05 01:12:31 +00:00
Carl Hetherington
cf5c707553 Locate during playhead drag, the primary motive being to get MMC to be sent during the drag, fixing #3239.
git-svn-id: svn://localhost/ardour2/branches/3.0@7365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-04 22:48:58 +00:00
Carl Hetherington
2c09798dc8 Modified version of lincoln's patch to allow X-axis scrolling in the summary when the drag starts above or below (but to the left or right of) the view box. Fixes #3299.
git-svn-id: svn://localhost/ardour2/branches/3.0@7364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-04 21:53:34 +00:00
Carl Hetherington
bde4d3f341 Fix up my previous buggy MMC cleanup.
git-svn-id: svn://localhost/ardour2/branches/3.0@7363 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-03 00:11:33 +00:00
2062ce8186 a few more if (_mmc) tests
git-svn-id: svn://localhost/ardour2/branches/3.0@7356 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-02 13:39:46 +00:00
082b4a2019 add MidiModel::sync_to_source() to push model state into its existing source; mark SMFSource as non-removable after its called SMF::end_write(); some indentation fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@7350 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 18:54:19 +00:00
601dc846da fix assumption that Session::_mmc != 0
git-svn-id: svn://localhost/ardour2/branches/3.0@7349 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 15:03:49 +00:00
d4db53e554 fix gcc4.4 compile warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@7348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 15:02:54 +00:00
d3a4655ddd allow zero length MIDI files again and remove debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@7347 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 15:02:18 +00:00
69b7b53aec fix gcc4.4 compile warning
git-svn-id: svn://localhost/ardour2/branches/3.0@7346 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 15:01:25 +00:00
d488ce49bb debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@7345 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 13:51:52 +00:00
Carl Hetherington
92e4126617 Allow port matrix to show both audio and midi ports at the same time, and use that facility for route IO selectors.
git-svn-id: svn://localhost/ardour2/branches/3.0@7344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-01 01:14:14 +00:00
Carl Hetherington
aad230da69 Improve behaviour of MIDI metering.
git-svn-id: svn://localhost/ardour2/branches/3.0@7337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 15:08:18 +00:00
Carl Hetherington
5f67a72c34 Basic tweaks to make the bundles and the port matrix accept that MIDI tracks may have audio IO, and vice versa. Allows connection of instrument tracks using the global port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7335 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 02:59:13 +00:00
Carl Hetherington
8efaca01ef Fix starting scratch buffer count.
git-svn-id: svn://localhost/ardour2/branches/3.0@7334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 00:11:27 +00:00
Carl Hetherington
4d80bdad7d Make main out delivery expand its output ports if the processor chain requires it.
git-svn-id: svn://localhost/ardour2/branches/3.0@7333 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 00:10:56 +00:00
Carl Hetherington
ff51abb988 Fix feature specification on instantiation.
git-svn-id: svn://localhost/ardour2/branches/3.0@7332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 00:09:56 +00:00
Carl Hetherington
d489009af7 Remove debug output.
git-svn-id: svn://localhost/ardour2/branches/3.0@7331 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-30 00:08:49 +00:00
dbf3ba2d73 allow zero-length SMF files on disk again; fix some gcc 4.X optimization-on compile warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@7329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 20:40:52 +00:00
501db4747b tweak the monitor section part of the startup wizard
git-svn-id: svn://localhost/ardour2/branches/3.0@7328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 20:39:44 +00:00
Carl Hetherington
7898aabcaa Fix vertical canvas autoscroll when dragging track heights. Fixes #3240.
git-svn-id: svn://localhost/ardour2/branches/3.0@7327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 19:08:19 +00:00