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
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
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
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
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
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
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
Carl Hetherington
bebeb5abec
Fix comment
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 19:07:22 +00:00
Carl Hetherington
ce8d79d621
Restore MMC registers.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7325 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 14:04:19 +00:00
Carl Hetherington
9469d6b26a
Clean up MMC transmission a bit, and make sure that it is all done from one thread.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7324 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 13:47:53 +00:00
Carl Hetherington
b47524ded2
const correctness.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-29 13:47:11 +00:00
Carl Hetherington
21e10145d8
realtime_stop does not need to send MMC as realtime_stop will have already done it.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7319 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 21:34:50 +00:00
Carl Hetherington
55695bfe2d
Fix hang on session going away when there is nothing to process. Fixes #3284 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7316 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 20:49:15 +00:00
Carl Hetherington
89b686f937
Tweak transmission of MMC on locate. Should fix #3121 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 17:25:40 +00:00
0be7d224f4
clear region history in Playlist::notify_region_added() so that it has no apparent history before being added to the Playlist.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 14:59:38 +00:00
74745856d6
fix basic logic problem in PropertyTemplate<T>::set so that current/old values are properly managed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 14:56:40 +00:00
Carl Hetherington
ed19559ece
Generate undo record for crossfade edits, and provide signalling to update the view when such things are undone. Partially fixes #3257 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 02:40:09 +00:00
Carl Hetherington
c8e07653da
Fix a couple of crashes on MIDI import.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 01:12:21 +00:00
Carl Hetherington
c5bbca0cf5
Add an EnumProperty for enumerated properties and hence make Region::position_lock_style a stateful property.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7306 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-28 00:34:09 +00:00
37978aa214
lots of details relating to MIDI file management; try to ignore ALSA sequencer MIDI ports named "Midi-Through"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-26 13:45:59 +00:00
Carl Hetherington
ecb0cd5d11
Make MIDI region `automation' respect the automation mode so that it is
...
only played back if the automation mode is set to "Play". Munge AutoState
for AutomationRegionViews so that they reflect their AutomationTimeAxisView's
setting. Fixes #3135 .
git-svn-id: svn://localhost/ardour2/branches/3.0@7304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-25 20:47:09 +00:00
ad81fd40d2
step back JACK dependency to 0.118
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 22:44:48 +00:00
806a22fefe
change note colors on the fly, to permit user-definition of colors more easily; remove some debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7301 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 19:46:28 +00:00
de24d4f8b1
add and use Source::empty() since it can be done more efficiently than length(pos) == 0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 18:04:38 +00:00
e72d710734
use condvar and exception-proof mutex for chain swaps in graph
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 18:04:02 +00:00
59a3dd2383
clear activation_sets component of Graph, thus restoring full Route deletion
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 16:20:32 +00:00
ea2f5f170b
fix math bug with numthreads computation
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 14:17:09 +00:00
0f5bdd666f
use JACK thread creation functions to create process-graph threads; provide GUI control over number of threads-relative-to-number-of-CPUS
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 14:13:45 +00:00
fe229a830e
GUI-created MIDI regions now steal the pending MIDISource from the track's diskstream, to keep numbering sane; don't create any new MIDI regions if capture collected no data (fixes a crash in my previous commit, and is just logically much more sensible
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-24 01:37:24 +00:00
f188ffffc1
fix some non-debug compile warnings
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 21:43:40 +00:00
8db2e27faa
use new Source::used() rather than SessionPlaylists::source_use_count() to determine if a file can be removed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 21:43:16 +00:00
f4401c5928
midway snapshot of work done on managing Region & Source lifetimes correctly. may fix missing MIDI file bug ; save empty playlists because they may be referred to by the history file ; undo commands auto-delete when objects they refer to die (currently not commands built from XML deserialization); Sources now know how many regions are using them for something, meaning that we know if we can delete the files holding any data for the source
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 20:14:07 +00:00
Carl Hetherington
cac03dbeb6
Update locations GUI more efficiently by avoiding a rebuild when a location is removed. Fixes #3263 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7290 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 01:51:55 +00:00
Carl Hetherington
055f839b1f
Trim includes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7289 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-23 01:50:37 +00:00
Carl Hetherington
108f537b69
Stop attempts to connect new MIDI tracks to bad ports when there is no MIDI IOs on the master buss.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7287 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 23:45:30 +00:00
Carl Hetherington
51270cf148
Coding style.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 23:45:15 +00:00
6e138fa068
fix some warnings that come from a non-debug build, some of which are actually errors in handling return values from boost::signal emissions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7285 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 15:26:03 +00:00
4f16de5cfe
GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitespace reformatting for some reason
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7284 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 14:46:17 +00:00
Carl Hetherington
5138cb5d05
Remove unused variable.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-21 01:02:47 +00:00
Carl Hetherington
40ffadf219
Return delta time even for metadata events. Should fix #3244 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-20 22:49:35 +00:00
Carl Hetherington
6c19e1c7ea
Invalidate old sources before forgetting about them. I think this prevents the possibility of an old source keeping a lock on the MidiModel via its iterator. May fix #3249 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-20 01:33:16 +00:00
3a048e1d6c
new fade in/fade out colors from chrisg
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7272 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 22:20:37 +00:00
2e644fe91f
prevent removal of master/monitor busses without explicit (and hard to set) approval
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 16:59:20 +00:00
a668964d5c
avoid needless errors when redoing an operation involving adding notes that were not added because of overlap exclusion preferences
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 16:58:50 +00:00
c158c44fab
make note overlap resolution store side effects in a DiffCommand, and add its changes to the DiffCommand being executed, so as to retain "internal" note property changes across undo
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-14 23:43:10 +00:00
f1fc47b077
MTC drift patch from robin gareus, plus two related cleanups to the tracer & debug messages
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-12 16:11:33 +00:00
fddb377812
introduce the notion that note additions and property changes can cause the removal of other notes because of overlaps; merge Diff and Delta commands in MidiModel; fix marshalling of notes to avoid float->int conversion of length+time properties; initial implementation (not tested much so far) of different policies for how to handle note overlaps
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-12 13:55:22 +00:00
14004b75a6
dynamic playback & capture buffer resizing (though transport is stopped first)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7250 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 17:24:07 +00:00
2b9dc7b380
permit different sizes for audio playback & capture buffers
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 14:11:46 +00:00
1e728e728a
basically, fix all kinds of odds and ends with MIDI playback, including missed notes and applying gain
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-09 13:00:54 +00:00
Carl Hetherington
5fd862ebc5
Small cleanup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7242 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:21:24 +00:00
Carl Hetherington
e67a6d8989
Update ring buffer read pointer correctly in case of a failure to insert an event into the MidiBuffer.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-08 01:21:01 +00:00
Carl Hetherington
e6becb3425
Better-define behaviour when relayering a playlist with a single zero-length region. Fixes #3144 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7238 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-07 12:44:15 +00:00
Carl Hetherington
4065c59ed0
Fix signedness error.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7234 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-06 00:31:29 +00:00
5f1e6f089f
more style-guidification
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7233 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:11:18 +00:00
15f1d68e9f
more style-guidification, plus do not run process threads RT if JACK is not RT
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7232 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:09:09 +00:00
04a10a9700
style-guide-ification
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7231 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:03:14 +00:00
ea39189938
style-guide-ification
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7230 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-04 12:02:00 +00:00
4d828729cd
add DEBUG::ProcessThreads as a debug tag for parallelization (probably to be renamed)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 21:28:02 +00:00
db1fa42f14
start tracking note overlaps while moving notes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7228 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 21:27:36 +00:00
Torben Hohn
1abbb506b8
move route_graph->rechain( r ); into Session::resort_routes_using
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7227 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:38:01 +00:00
Torben Hohn
932d6c79d0
[3.0P] dont dump chain(1) in session.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7226 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:09:27 +00:00
Torben Hohn
357cf39470
add missing graph.cc and friends :S
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7225 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 20:09:17 +00:00
Torben Hohn
c59dade835
merge 3.0P into trunk.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7224 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 19:50:22 +00:00
9208598c26
Sequence::contains() and Sequence::overlaps() now use pitch-based indexing to speed things up in pathological cases
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7221 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:58:15 +00:00
b12f624890
modified version of a patch from robin gareus to avoid leaving pointers to data buffers owned by Session as the buffer for a JACK MIDI event. Robin - it would be good if you could test and confirm (email?) that my modified version also works
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7218 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 12:37:32 +00:00
460d2d0675
add channel+pitch indexing for notes in a Sequence
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7217 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 19:55:37 +00:00
baacf1c7b4
forward port ConfigVariable<bool> fix from 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7216 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 19:54:05 +00:00
Torben Hohn
71c876109f
add -P flag to the session command return value.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 16:35:41 +00:00
Torben Hohn
51ad790745
add -P flag blocking port connections while loading session
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 16:21:02 +00:00
Torben Hohn
b65fe35f67
reenable loading of a statefile specified at commandline
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:50 +00:00
Torben Hohn
f27c481af1
add template support to jack-session code. and also generate timestamped name
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-02 14:36:31 +00:00
0cd3bd4f19
rationale pathways that add notes to Sequence<T> so that there is only final insertion step; when changing note properties that affect "indexing" within a Sequence<T> (i.e. via set<T,comparator> indexing/ordering/hashing), remove the note and add it back so that indexing stays consistent; fix marshalling of MidiModel::DiffCommand (boost::bind(&Object::method, reference_to_object) will COPY the reference, so use a pointer); fix MidiModel::find_note() to compare note properties not pointer addresses
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7203 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-01 20:40:45 +00:00
df99f37047
add missing (new) file
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-01 01:22:37 +00:00
db67064296
switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<...,EarlierNoteComparator> for _write_notes, does FIFO note resolution for overlapping notes in SMF file; implement Sequence::overlaps() ... current use is uncertain; ARDOUR::coverage() uses 64bit framepos_t
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 19:47:15 +00:00
a01dc9b6f2
remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-31 14:21:43 +00:00
9b5f357490
make trimming in region name (colored) highlight work even in internal edit mode; change enter/leave handler to return true by default (MIGHT HAVE UNINTENDED EFFECTS on mouse response), thus avoiding multiple stacked canvas items fighting over enter/leave
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-30 20:13:29 +00:00
60ec5dd339
provide a generalized Sequence::get_notes()-by-predicate method, and prototypes for 2 future methods
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7191 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 21:36:38 +00:00
3d6493abc9
replaced gtk_idle_add() with g_idle_add()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-28 16:33:18 +00:00
Carl Hetherington
36538ed3df
Take route's processor lock for things called by the process thread. Prevents problems when processors are being reconfigured and a process callback occurs.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7183 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 17:10:08 +00:00
d15082d828
remove commented debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 15:06:39 +00:00
Carl Hetherington
d0d160e566
Fix crash on clear option for automation tracks ( #3195 ). Also fix state change signalling so that lines reappear on undoing a clear.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 12:26:00 +00:00
Carl Hetherington
d47161b9ee
Use bbt_add and bbt_subtract to do proper BBT maths in round_to_beat_subdivision.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-27 00:26:32 +00:00
Carl Hetherington
102f64f94c
Remove empty MIDI regions which result from recordings made when no MIDI data is received.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7167 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 16:03:47 +00:00
b91e1f3605
generate knob pixbufs at run time but draw from the pixbufs; remove mfimg utility and existing knob icon png files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 15:18:04 +00:00
Carl Hetherington
7b8f584167
Remove some unused methods.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-26 11:54:25 +00:00
6b19aee3b5
split out sndfile manager code into its own file; move a couple of utility functions into gtkmm2ext ; add knob PNG generating tool ; break appearance of monitor section for now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7160 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 16:45:21 +00:00
Carl Hetherington
943edf1b5d
Use debug macros for SMFSource.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7150 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 22:39:36 +00:00
Carl Hetherington
32d2e2eaac
Preserve source's model on clone() if it is not rebuilt. Should fix #3155 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 21:45:50 +00:00
Carl Hetherington
dd134d8afb
Note the time of the last event that was read by read_unlocked, so that the current time can be reset on a subsequent call.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-24 15:42:27 +00:00
a196405da9
various minor MIDI fixes: prevent duplicate note entry with mouse, show note info more often with verbose cursor, fix some crashes from click+move on notes ... lots more where this comes from
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 22:38:12 +00:00
Carl Hetherington
84a801a791
A few cleanups and rearrangements in the RC options. Add options for default mute-affects-* settings, and make routes obey them.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7122 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 01:30:35 +00:00
Carl Hetherington
03bed9a8cb
Use SMFSource static method to look for MIDI file extensions.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 23:36:18 +00:00
Carl Hetherington
6ad69a206c
When muting a route because another is soloed, take
...
into account the muting options (pre-fader/post-fader etc.)
for the muted route.
git-svn-id: svn://localhost/ardour2/branches/3.0@7119 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 14:32:49 +00:00
e258b2622a
MIDI region forking, plus Playlist::regions_to_read() fix forward ported from 2.X. region forking requires a few cleanups
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-19 03:03:28 +00:00
Carl Hetherington
afbc04a65b
Tiny cleanup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7116 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-18 01:05:12 +00:00
Carl Hetherington
f35dc8b35d
Remove muting behaviour from the Amp processor. Fix some small
...
bugs with delivery muting. The upshot being that muting now definitely
happens in a channel's deliveries, and not really in the channel strip
at all. When the channel is muted, those deliveries described by
the MuteMaster settings are muted. Should fix #3141 .
git-svn-id: svn://localhost/ardour2/branches/3.0@7115 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-17 23:28:13 +00:00
Carl Hetherington
6d9c1201cc
Fix assertion failure on time FX of MIDI regions ( #3136 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7112 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-17 19:32:16 +00:00
Carl Hetherington
f1114dedee
Move FileManager code into libpbd. Use it for SMF read/write.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7108 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-16 20:54:50 +00:00
Carl Hetherington
50615cd17c
Fix crash when dragging something from another task over the editor window.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-16 18:51:05 +00:00
Carl Hetherington
0e0beef90f
Fix some excessive search-and-replaces.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7104 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-15 23:57:41 +00:00
Carl Hetherington
0fd0679c67
Keep to a quota of open files by closing least recently used ones as required. Should fix #2341 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7101 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-14 02:24:44 +00:00
Carl Hetherington
1f196b4013
Make butler handle auditioner again. Fixes #3128 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-13 19:35:35 +00:00
Carl Hetherington
5670e2c3a4
Reset buffer stats on stop. Remove unused minimum playback/capture load stats.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7098 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-12 00:29:28 +00:00
Carl Hetherington
d60ca669a0
Update diskstream statistics when rolling. Should fix #3067 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7096 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 23:22:15 +00:00
Carl Hetherington
ac3265d7f4
Evidence from Chris suggests that imported OGG files can clip, so check for that.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7095 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-11 00:43:28 +00:00
Carl Hetherington
792e3de1d4
Create the session range location as and when the session first gets some content. Allows both the beginning and end of the range to expand to contain the actual session contents.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 20:48:21 +00:00
Carl Hetherington
ea1a103b26
Reset both IO names rather than just one when setting up the use of a track template.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 00:47:16 +00:00
Carl Hetherington
45b5b19da2
Re-throw exception slightly better.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 00:46:54 +00:00
Carl Hetherington
542372cd18
Add debug() method to dump XML nodes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-09 00:46:33 +00:00
78b8eaf565
save global state when quitting BEFORE we stop the engine, so that global MIDI ports are still connected and thus will re-establish their connections on session reload
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7082 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 16:47:57 +00:00
Carl Hetherington
8d0581a720
Remove use of i18n macros in headers. Prevents our gettext.h being included before libintl.h, which causes failures when ENABLE_NLS is not defined (bug #3111 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 01:20:33 +00:00
133aaeaf58
tweak knob drawing, add angular/radial control on button3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-07 16:33:25 +00:00
29da90651e
prolooks helper code from hans, enabling new knob drawing based on Thorsten Wilm's lovely knob/dial design. To Be Tweaked
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 21:02:08 +00:00
f2ceb5c340
lots of odds and ends to do with solo isolate and its GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7072 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 18:40:37 +00:00
e1ed9467dc
draw LED background with same style as parent window; less debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7070 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-06 02:48:59 +00:00
1ae1eeb257
led\'s for solo-safe and solo-isolate, rather than a context menu (mixer strip only). not finished and some logic errors in terms of turning things on and off
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7066 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 20:29:46 +00:00
958d5ffefd
less debugging
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7065 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 15:48:09 +00:00
3fa522e5df
make "exclusive solo" apply to listen as well as SiP
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7064 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 15:47:51 +00:00
896a0a991c
rename latched solo option and reverse its meaning; add exclusive solo button functionality in monitor section; add solo/mute override control in monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7059 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 14:09:58 +00:00
2e1d964528
add DEBUG::Solo for conditional debugging of solo stuff, just in case
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7058 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 03:20:16 +00:00
970f749110
remove solo debugging output for now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 03:09:34 +00:00
9a1cce915b
this might just be it for solo
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7056 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 03:06:14 +00:00
8f59346592
better handling of the inverse-push of solo-by-upstream. still not quite right, but closer
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7054 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-05 01:43:25 +00:00
6d9f600560
fix inverse solo push to work properly in both exclusive and non-exclusive solo modes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7053 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-04 17:45:33 +00:00
bf6de6da77
remove muted-by-others, a concept that turns out to have been a red herring; add auditioning alert button to monitor section; start adding exclusive solo button to monitor section
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7052 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-04 16:39:03 +00:00
823bad3049
when soloed by upstream (e.g. a track in a group solos-by-upstream the group bus), push the inverse solo change back down to everything that feeds us. this makes solo within a group work
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-04 13:29:38 +00:00
dda0622957
the great solo model simplification (without much code removal)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-03 22:07:47 +00:00
e33d4553b2
more solo model work, including a GUI fix for mute button state when the route is self-soloed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-03 18:58:38 +00:00
Carl Hetherington
c2da4ec8f9
Prevent multiple tempo / meter changes being inserted at the same point
...
on the timeline; adding a new change at the same time as an existing one
will replace the existing one. Should prevent #769 from happening.
Some cleanups and tweaks to tempo / meter dialogues. Desensitize Remove
menu option for those changes that can't be removed.
git-svn-id: svn://localhost/ardour2/branches/3.0@7045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 23:14:43 +00:00
Carl Hetherington
ceb1025c2c
Small cleanup: add constructor to InterThreadInfo.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7044 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 19:08:30 +00:00
Carl Hetherington
b30fa60ad9
Fix crash on export.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7038 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 13:14:06 +00:00
Carl Hetherington
0d0e32d8b3
Various fixes to multiple-2D panner signal handling. Should fix some or all of #1632 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 01:33:25 +00:00
Carl Hetherington
78da07607d
Fix snap to bars to account for the fact that the beats are counted from 1 rather than 0.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7034 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 23:35:04 +00:00
576cdb08b5
perhaps, just possibly, a working solo model. needs to be fixed so that connections to other JACK clients count as "physical" connections, so don't use this with ardour connected to other JACK apps just yet. Oh, this also invalidates existing a3 sessions again
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7033 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-01 15:09:19 +00:00
Carl Hetherington
d57a472c16
Delete cross-thread pools when the thread terminates if they are empty. Hopefully fixes #3094 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7022 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-29 22:55:27 +00:00
27dfb74bda
add proper conditional-header creation and inclusion for VAMP plugins
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7012 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 12:25:16 +00:00
f796c0f177
remove some silent-buffer-detecting debugging code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7011 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 12:03:16 +00:00
57f01f2d66
notify about changes to solo-isolated state
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 01:37:38 +00:00
6dac4da983
more solo/mute architecture work. NOTE: changes to mute points are ignored right now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-28 01:29:06 +00:00
47de938e99
add muted-by-other concept to solo support infrastructure
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7005 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 17:10:04 +00:00
a8e354ed7b
yet more work on Ye Fabled Solo Architecture. now do forward and backward propagation of solo status from a soloed track. tweak GUI appearance
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7001 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 03:10:53 +00:00
Carl Hetherington
56469c1956
Revert my revision 6996, which was wrong. Sources need to stay around in the session even when they are no longer being used as the write source for a Diskstream.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 00:59:31 +00:00
Carl Hetherington
581376e0ed
Make Session::audible_frame() return a (more) correct answer when the transport has changed direction since it last started rolling. Fixes some playhead anomolies when reversing the transport.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 00:57:46 +00:00
Carl Hetherington
83b30a6d06
Remove some debug code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6998 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-27 00:29:35 +00:00
Carl Hetherington
e112ed3d6a
Make Session listen to DropReferences from Sources, and remove them. Call drop_references for a Source in one imnportant case which occurs during MIDI track creation.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6996 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 21:29:47 +00:00
Carl Hetherington
e950e5de0b
Truncate / expand gain envelope when region length changes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6990 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:24:46 +00:00
Carl Hetherington
a4917c9831
Preserve gain envelopes across filtering operations and stretch them across time stretches. Fixes #902 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6989 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:23:40 +00:00
Carl Hetherington
ed9d42c55d
Some comments and minor cleanup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-26 00:22:26 +00:00
Carl Hetherington
990f3391ad
Make attenutation during fast forward/rewind configurable again. Fixes #3089 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6985 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-25 15:30:14 +00:00
Carl Hetherington
f29c96c188
Fix setting of location start position. Fixes #3090 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6984 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-25 14:33:42 +00:00
Torben Hohn
4cd13b606f
fix session loading
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6967 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 16:36:52 +00:00
Carl Hetherington
3bfb8ce383
Gah! Typo in previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6960 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 12:22:57 +00:00
Carl Hetherington
c71cc3702e
torbenh's buffer manager fixes from 3.0P
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 12:20:04 +00:00
Carl Hetherington
9213e9c909
Allow more than one peaks_ready callback to be pending for an AudioRegionView
...
at any one time. Prevents problems when there is more than 1 channel for which
peaks are not ready; before, the first peaks_ready callback would be forgotten
when the second one was requested. Should fix #3074 .
git-svn-id: svn://localhost/ardour2/branches/3.0@6951 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 01:40:33 +00:00
Carl Hetherington
5b4b2c04e5
Fix compile warning.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 01:38:47 +00:00
Carl Hetherington
bc8a459dbe
Clean up some location handling bits; should fix update of editor summary when session start/end is moved.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-22 00:20:57 +00:00
Carl Hetherington
b32efee4b3
Fix loading of MIDI tracks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 21:44:10 +00:00
Carl Hetherington
950ac6ef2b
Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 21:29:15 +00:00
Carl Hetherington
061a85191c
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 20:42:22 +00:00
d9cebc2edf
commits 6001-6525 inclusive from 2.X applied to 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6942 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 02:24:38 +00:00
f119387d76
indicate "soloed-by-others" state on solo button via a "half-lit" state
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6939 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-20 12:38:37 +00:00
2cb5595b11
fix solo/listen issues when reloadign a session, caused by that last commit
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 17:48:11 +00:00
1ceee92bb5
permanently mark Delivery processors on master/monitor/audition as immune to solo effects, rather than having to reset them every time something else is soloed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6936 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 14:02:53 +00:00
Carl Hetherington
0cde999d87
Move toggle-waveforms-while-recording into RC options.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-19 01:40:42 +00:00
Carl Hetherington
0a40e0be86
Load 2.X sessions correctly with newly-arranged session start/end markers.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 23:58:43 +00:00
Carl Hetherington
e4258dcaf9
Small cleanup.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6932 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 23:58:21 +00:00
Carl Hetherington
895bad1dcd
Make the session start/end location a single location (with start and end) rather than two separate ones. Fixes #1298 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 21:29:48 +00:00
5ddedeec73
make sure that meters are configured to handle the right number of channels, and allow internal returns to be restored from XML in non-monitor busses
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6917 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-16 19:31:10 +00:00
dc815ea8e8
forward-port from 2.X commits 5827-6000 including
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6914 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-15 20:42:05 +00:00
Carl Hetherington
d2e26e3219
Remove out-of-date members of freeze_record which are now accounted for by Processor state.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-15 00:43:52 +00:00
Carl Hetherington
84e92060fd
Prevent crash in pool destruction during session teardown.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 23:58:20 +00:00
Carl Hetherington
7939dd9399
Don't run meters either during freeze.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 23:58:07 +00:00
Carl Hetherington
3d3e889dd6
Separate interthread progress window out into its own class and HIG-ify it a bit. Make the import progress bar report on the whole import rather than individual files.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6894 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 22:16:46 +00:00
Carl Hetherington
8783fc35f2
Suspend deletion of cross-thread pools until they are empty. Prevents crashes when the freeze thread completes.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 22:06:12 +00:00
Carl Hetherington
72f8544b24
Don't run deliveries to output ports during export / freeze.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6892 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-14 15:21:55 +00:00
a83157de45
remove babbling torrent of debug output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-13 21:05:59 +00:00
3ea10b38bb
substantive change: use the JACK wait API and provide "thread buffers" separately from session in preparation for parallelization. lots of debug output at present. If using JACK1, requires a very current version of JACK1 SVN (0.119.0)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-13 20:48:33 +00:00
Carl Hetherington
46ea5f5f58
Reduce stack requirement of AudioTrack::export_stuff, which fixes a crash when freezing.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-13 01:18:05 +00:00
981c8906fb
alignment/capture/positioning changes ported from 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-12 22:35:06 +00:00
Carl Hetherington
33028f4d6d
Fix import dialogue to correctly report (x of N) with multiple files, and slightly prettify it. Partially fixes #3064 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-10 01:35:11 +00:00
Carl Hetherington
f4ac9430f3
Prevent clipping during the import of files from sources that have
...
amplitudes greater than 1 when data is being stored in files that
are clamped. e.g. when importing hot sources and resampling them
when the session file format is integer.
git-svn-id: svn://localhost/ardour2/branches/3.0@6879 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-09 14:11:47 +00:00
77c09fc824
add support for "msg=" bindings and also action="SomeGroup/Action"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6876 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-08 21:05:55 +00:00
5970212b87
similar fix for punch recording as applied to 2.X, with additional tweak that when we fetch the audio port buffer, we must use the full nframes() for the current ::roll() call and not rec_nframes. otherwise, we get back an AudioBuffer that thinks it is smaller than it really is. there may be other issues with this distinction lurking somewhere
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 14:39:34 +00:00
Carl Hetherington
298db6ef35
Add virtual destructor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 12:49:31 +00:00
Carl Hetherington
2e2b35d953
Comment format.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6866 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-07 00:17:19 +00:00
e3ed1adadd
(3.0 version of 2.0-ongoing) fix 100% CPU usage after killing JACK caused by faulty logic in butler thread main loop
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-06 18:17:46 +00:00
e69aca2842
MIDI/Controllables for monitor section, and related fixes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-06 16:57:35 +00:00
Carl Hetherington
3a7487d3fa
Resort routes after processors change. Ensures that, e.g. things work after adding sends to tracks. Fixes #2794 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-06 12:13:38 +00:00
Carl Hetherington
60158fd2b4
Emit signal when a group's active state is changed. Fix restoration of state from XML.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6859 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 17:17:48 +00:00
Carl Hetherington
6e49c73bb0
Make port matrix notice when connections are changed outside of ardour.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 15:23:54 +00:00
9644362c92
remove some OS X cruft in io.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6856 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 16:11:56 +00:00
7151d28ae3
fix build process to avoid mismatching size/layout of AudioEngine object; use a slightly more efficient way to access the engine's process_lock from within io.cc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6855 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 15:53:19 +00:00
3104041e67
meter point restore handling, and related matters
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 13:40:34 +00:00
Sakari Bergen
d166d0584f
Re-connect some signals in export format stuff
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6853 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 08:40:21 +00:00
Carl Hetherington
8a8552c4cb
Allow cross-thread request invalidators to cope with multiple requests
...
being logged before they are handled, and to invalidate them all rather
than just the last one. Fixes shutdown problems when the PortMatrix has
been opened during the session, during which PortRegisteredOrUnregistered
is emitted quite heavily.
git-svn-id: svn://localhost/ardour2/branches/3.0@6852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-03 00:42:39 +00:00
Carl Hetherington
f14a33e492
Couple of comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6851 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 23:11:15 +00:00
Sakari Bergen
9943e0c6be
Make session and master outs the default timespan and channel config for export
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6849 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 22:57:02 +00:00
Carl Hetherington
e31c2e4dcb
Fix logic for when to request buffer overwrite.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 22:45:50 +00:00
Carl Hetherington
12ce8f17f4
Fix build.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6847 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 22:45:30 +00:00
Carl Hetherington
4dfa48ad1d
Add missing test file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 21:11:45 +00:00
c7b867bddb
missign return value
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 21:11:01 +00:00
Sakari Bergen
48dd5afaa5
Make audiographer SndfileWriter use PBD::Signal and use it properly. Also make export graph stuff use boost::ptr_list (because of ScopedConnection non-copyability)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 20:49:02 +00:00
ad7025ae84
possible fix for race between diskstream buffer overwrite and channel setup
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 20:14:28 +00:00
7ed95f7c37
(FULL) not-yet-complete JACK session management patch (TODO: get program name, vary snapshot name, arrange quit when necessary)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 18:54:33 +00:00
Carl Hetherington
97e11c790f
A few more libpbd test tweaks.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 16:38:23 +00:00
Carl Hetherington
69f135517a
Unbreak build. Sorry.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:45:01 +00:00
Carl Hetherington
9c5f36c328
Missing file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:37:11 +00:00
Carl Hetherington
eecb8c496a
Some stub tests for scalar properties.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:35:36 +00:00
a48742043b
remove PBD::Connection (replace use with PBD::ScopedConnection); remove limitation on transport roll after session end
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:24:53 +00:00
Carl Hetherington
3dd7f05fb1
Remove empty file.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:58:39 +00:00
Carl Hetherington
2fa02997dd
Add script to run libpbd tests.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:55:34 +00:00
Carl Hetherington
9e3280ae67
Build libpbd tests using waf.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:52:55 +00:00
Carl Hetherington
24fee4b8ef
Rename tests to test to match up with other libraries.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6830 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:42:38 +00:00
Carl Hetherington
1cc0bc8344
Fix crash in test.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:30:14 +00:00
Carl Hetherington
9b35264bdb
Make sure that tests are rebuilt even when only their headers change.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6828 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 14:30:00 +00:00
Carl Hetherington
b68256a8ff
Fix up route group state signal handling. Make the PropertyList version
...
of Stateful::set_properties emit a changed signal after it has done its work.
git-svn-id: svn://localhost/ardour2/branches/3.0@6826 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 00:21:08 +00:00
38575cd805
fix save+restore of Gtkmm2ext::Tearoff state; a few cerr cleanups
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6823 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 02:29:13 +00:00
Carl Hetherington
2ad3940b54
Oops. Actually make new Properties changes work.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6822 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 02:18:58 +00:00
f08a4e014d
don't override user naming of send/return/port inserts
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 01:59:47 +00:00
c0c617902e
revisit setting up processors during route construction; remove several more XML-based constructors; don't put () parens around inactive plugin names (we have a checkbox); improve management of send, return and insert bitslot IDs; clean up Diskstream construction a bit more
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6819 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 01:24:13 +00:00
Carl Hetherington
50dd880d7e
No-op: rename a few variables and add/fix some comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-01 01:07:24 +00:00
Carl Hetherington
afc5e3bd02
Rework to set Stateful properties automagically in the Stateful class rather than delegating to subclasses.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6817 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-31 22:45:27 +00:00
Carl Hetherington
7f8b337d30
A few small cleanups to the property code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@6816 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-31 22:17:01 +00:00
