efb1e10ff7
fix coloring of global rec-enable button when actively recording; fix related issue when loading a session with an already rec-enabled track
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 18:28:09 +00:00
b08d13706f
remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 17:43:55 +00:00
009c7a9e44
attempt to stop sending MMC/MTC while exporting or freewheeling for any reason
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11457 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 17:09:53 +00:00
f4f2a9a111
fix bug in MidiClock that sent MIDI Clock messages with negative offsets after a loop point
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11456 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 15:05:18 +00:00
d0b94ebc1e
likely fix for crash-by-assert just after a MIDI diskstream overwrite (e.g. just after an edit, while playback is active)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 14:58:03 +00:00
f77ed1c692
even more debugging info for zth
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 14:35:00 +00:00
d0b1a8100a
yet more debugging info for zth
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 14:28:43 +00:00
bdbba5af35
some more debugging info for zth
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 14:14:40 +00:00
1f0fe4a449
removed #ifdef'ed trace_midi() code (dup'ed from libmidi++)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 14:10:40 +00:00
e7c0919257
some debugging info
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11450 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-06 13:50:26 +00:00
6db9cb8d75
add some more variants of the cairo rounded rectangle code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 03:55:58 +00:00
02ec346c2b
add virtual method is_instrument() to PluginInfo (already existed for AUPluginInfo) and use to determine if plugin is an instrument for the purposes of AddRouteDialog, since the rules are plugin-type specific
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11426 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02 18:51:32 +00:00
af90dc2bae
add a way to create a new MIDI track with an instrument pre-selected
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-02 04:12:23 +00:00
Carl Hetherington
452672f78f
Make crossfade convert-to-full and activate/deactivate work across edit groups ( #4658 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 01:07:52 +00:00
Carl Hetherington
6b65e684eb
Tidy up slightly.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11412 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 01:07:44 +00:00
Carl Hetherington
396b8adffe
Trim declaration.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-01 01:07:37 +00:00
40af4b914f
use musical_time_equal() test for equality when copying note data, not strict floating point equality. should fix #4609 (and maybe another one too)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11407 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 23:20:13 +00:00
Carl Hetherington
34881407e7
Make crossfade active state and length changes undo-able.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11406 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 23:06:12 +00:00
Carl Hetherington
0a720e5753
Comments.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 21:56:33 +00:00
7629120cda
many changes, large and small, related to smart mode editing, range/region selection, and behaviour of playhead when always-play-range is enabled. could be buggy, but probably in subtle (or even very subtle) ways rather than obvious
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 22:53:22 +00:00
Carl Hetherington
8d0f685d52
Fix faulty comment in previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11392 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 21:11:35 +00:00
Carl Hetherington
90bab430c4
Fix non-summon of butler when a track that needs it is followed by a track that does not (in the single-process-thread-CPU case). Should fix #4677 .
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11391 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 20:58:17 +00:00
Carl Hetherington
8f0b5a326b
Add assert.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11390 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 20:58:09 +00:00
Carl Hetherington
35a4144e45
Add aux sends at the position that the menu was opened, rather than always pre-fader ( #4660 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11387 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-30 18:09:54 +00:00
Sakari Bergen
dba601eeab
Show an example filename in the main export dialog
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 20:55:44 +00:00
Sakari Bergen
71a5e435e6
Add timespan name to export status text
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 09:51:30 +00:00
Sakari Bergen
aaec2a8480
Fix issue with export channel splitting getting stuck in the filename
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11380 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 19:20:17 +00:00
6f23443c26
Fix compilation with older Glib.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 18:19:19 +00:00
Sakari Bergen
db384a6f14
Go back to one progress bar with several passes in export.
...
Don't calculate the progress bar position in the engine, let the UI decide.
Work around progress bar bug (not verified, as I could not reproduce).
git-svn-id: svn://localhost/ardour2/branches/3.0@11377 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 18:14:19 +00:00
Sakari Bergen
ab8cea1d7c
Store Region export state in instant.xml ( fixes #3935 )
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 15:05:53 +00:00
Sakari Bergen
aaf418bd6f
Fix compilation with older lilv (0.5.0)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11375 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 13:36:13 +00:00
2858d43902
Use new Lilv state API to save LV2 plugin state.
...
This saves a complete history of plugin state, i.e. save is no longer destructive. However, data is shared as much as possible, and new state is only written if the plugin state has actually changed. There is exactly one link in the entire session directory to any external file, so archiving will work with minimal copying.
Not sure sure about the naming of the "externals" directory, but I have nothing better...
git-svn-id: svn://localhost/ardour2/branches/3.0@11372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 01:45:15 +00:00
19ebdba1cb
restore independent gain control over click/metronome
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 22:47:16 +00:00
d17918e32e
patch for CUE file formatting from Andreas Ruge
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 19:15:47 +00:00
f56bbe2799
fix inconsistent display on selection clocks when in join-object-range mode, and fix restore of that mode from session state via new ActionManager::set_toggle_action()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 19:05:03 +00:00
27747a6ee2
fix #4443 - tape track files need to be created when opened, not when written to
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11363 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 17:08:39 +00:00
33c61757fc
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 16:29:01 +00:00
fc3be1d42c
further simplification of midi clock ticker API
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11361 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 13:27:01 +00:00
6a999b8287
change audioengine's port container to a std::map to provide faster results from get_port_by_name()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 13:23:39 +00:00
98ade9348a
rework design of midi clock ticker to avoid expensive generalization that has turned out to have no particular use, and fix bug that caused incorrect ticks to be sent (or attempted) as the transport starts up
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 13:22:55 +00:00
e3b2111109
add Port::PostDisconnect signal to allow objects other than the one being directly disconnected to act when disconnection happens. This turns out to be much easier than using the JACK port connect/disconnect callback
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11355 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-26 19:00:27 +00:00
9b3aefec1b
an improvement to the previous patch to catch up with solo state after a disconnect, but still not really done because it doesn't get triggered for both ends of a disconnect
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11353 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 21:19:48 +00:00
18bc80a01c
toc filename handling patch from andreas r.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11352 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 21:14:51 +00:00
9ac351e60c
fix #4405 , by explicitly cancelling solo when a route's inputs drop to zero
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11346 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 15:30:02 +00:00
Carl Hetherington
275e710e67
Move reader lock to avoid deadlock when calling bbt_time().
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11342 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:42:43 +00:00
Carl Hetherington
eadc2192c5
Remove unused variable.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11338 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 20:48:01 +00:00
Sakari Bergen
f57da9b00e
Show proper progress information for export while normalizing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 20:21:54 +00:00
Carl Hetherington
e6a7a67933
Make plugins-stop-with-transport work; should fix #4641
...
as a side-effect.
git-svn-id: svn://localhost/ardour2/branches/3.0@11336 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 19:53:48 +00:00
Carl Hetherington
ddd162bdb0
Make time stretch respect edit groups ( #4615 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 17:04:15 +00:00
035074d1b7
provide ActionManager::do_action() as a way to trigger any action item as if the user has asked for it via some UI proxy
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:19:38 +00:00
175036ea4e
always write a PERFORMER entry into a CUE file even if its not defined
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11331 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:18:06 +00:00
d7e17f088f
make adding tracks/busses from templates just like adding them at the start of a session, in that IO connections are prevented until they are all added, and then we connect. this should fix the locking issue in #4643
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 13:43:48 +00:00
68e72c94c8
more useful error message when an internal send fails to find its target
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 13:34:20 +00:00
e2b181bc5c
a better fix for click oddness: do not clear clicks when transport stops till *after* the new _transport_frame value has been set, so that we know when the clicks were accurately cleared
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 02:30:46 +00:00
e09dccc662
clear clicks when auto-returning, looping or whatever
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 01:34:50 +00:00
f5e1f6eed6
remove debug output; increase size of click pool, to cover long latency settings and so forth
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11325 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 01:34:25 +00:00
d0ef18e94e
improved fix for TOC string escaping, handle anything that can be converted from UTF-8 to Latin-1
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 01:03:42 +00:00
5248d79fa4
undo escaping of strings in CUE files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11321 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 22:11:01 +00:00
9a21640567
a better fix for CUE/TOC string escaping: if the text is not Latin-1 already, reject it because TOC certainly cannot handle UTF-8 and CUE is probably better off without it too
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11320 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 21:53:08 +00:00
bc3e1a2122
fix failure to find route templates
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11319 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 19:49:46 +00:00
Carl Hetherington
4c224ef955
Speed up iterating over an entire PortSet by keeping a
...
separate list of all ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@11318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 19:35:56 +00:00
Sakari Bergen
0bede516be
Fix export threading timeouts when disk operations take long. Might fix other timeout issues also.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11317 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 18:54:13 +00:00
Carl Hetherington
a71172feb2
Trim calls to parameter_count() a bit during the process
...
thread.
git-svn-id: svn://localhost/ardour2/branches/3.0@11316 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 18:17:09 +00:00
Carl Hetherington
9b4f0f7242
Cache results of lilv_port_is_a(...) in various places.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 18:02:22 +00:00
9c6ef3788c
escape \ as \034 in TOC files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 17:24:34 +00:00
cbaa0d472e
fix up escaping of strings in TOC files (suggested by andreas ruge)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 17:16:53 +00:00
Carl Hetherington
d999895018
Add another profiling session.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 17:16:53 +00:00
Carl Hetherington
f0ff841d01
Tidy a few things up.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 16:03:08 +00:00
Carl Hetherington
62304d57c6
Basic process thread profiling code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 15:01:08 +00:00
Carl Hetherington
61c57e7c4d
Optimisation; it is much cheaper to run UnknownProcessor on the
...
rare occasions that it exists rather than dcasting every processor
to check for it. Also put the dcast of PeakMeter off if possible.
git-svn-id: svn://localhost/ardour2/branches/3.0@11309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 14:53:25 +00:00
Sakari Bergen
8e98352b6c
Add toc and cue information to export format descriptions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11306 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 18:07:53 +00:00
Sakari Bergen
09d1fbd6c1
Add warnings for overwriting marker files
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 18:02:27 +00:00
Carl Hetherington
e317386c5c
For now, only use the multi-threaded process code if we are
...
using >1 processor for DSP; this involves making the DSP
use setting only take effect on a restart of Ardour.
git-svn-id: svn://localhost/ardour2/branches/3.0@11302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 12:28:49 +00:00
Carl Hetherington
9080c672a5
Patch from anrug to always put a PERFORMER field in TOC
...
files (#4649 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@11299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 10:43:37 +00:00
Carl Hetherington
b447024c32
Add option to use plugin GUIs or Ardour generic ones.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 10:18:37 +00:00
Carl Hetherington
c95b34642f
Use a button in the processor box for toggle parameters.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 22:54:36 +00:00
Carl Hetherington
4381b590bb
Reinstate user Controllable values, as they are needed
...
for gain (which I forgot about).
git-svn-id: svn://localhost/ardour2/branches/3.0@11293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 16:38:56 +00:00
Carl Hetherington
a8bb49e5d8
Add a send amp's gain control as a send controllable.
...
Tweak AutomationControl now that PBD::Controllable has
a default implementation of user_to_ui and ui_to_user.
Add correct implementations of these methods to
Amp::GainControl. Hence allow SendProcessorEntry to
use the generic mini-fader-adding code from
ProcessorEntry.
git-svn-id: svn://localhost/ardour2/branches/3.0@11292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 16:38:45 +00:00
Carl Hetherington
17e6f1952e
Remove unused code.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11289 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-21 02:42:53 +00:00
Carl Hetherington
5a53f2f1b9
Simple approach to putting plugin controls into the
...
processor box.
git-svn-id: svn://localhost/ardour2/branches/3.0@11288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 18:02:48 +00:00
Carl Hetherington
d03d0363a4
Remove unused concept of user' values. Make user_to_ui
...
and ui_to_user virtual members of PBD::Controllable.
git-svn-id: svn://localhost/ardour2/branches/3.0@11286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 18:02:36 +00:00
052a0785b5
slightly more efficient implementation of Graph::in_process_thread()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 14:35:02 +00:00
facd8b2d90
reverse prior commit, which causes a deadlock between IO::enable_connecting() and Route::add_send_to_internal_return() - issue needs a fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 14:34:47 +00:00
77f9a1e75c
fix an assert failure due to incorrect process locking when adding a send
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 13:47:08 +00:00
cc5e8d41da
patch from colinf to make dbl-click on send "box" map its controls to the strip; remove related stub functions from ProcessorBox; fix crash when removing send due to the process lock not being held
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11274 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-20 03:39:45 +00:00
65c8d673a2
restore ability to create TOC and CUE files during export. this is an option in a given export format, not a per-export choice. so you need export formats with them set (or not) in order to utilize this choice. the resulting CUE/TOC files have not been checked with a burner (e.g. cdrdao) and testing of them would be appreciated - i (paul) have no CD burner h/w
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 21:56:06 +00:00
759f1216af
fix reload of session with new send naming in place, drop "aux-" prefix from name of aux sends
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 18:37:26 +00:00
9524b08752
fix two major assert failures arising from the optional monitor section commit; separate numbering of aux sends, sends and listens to fix #3671 (still testing, but the assert failures are critical)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 17:51:57 +00:00
Carl Hetherington
9237c7411c
Catch exception thrown by SMF code when it cannot write
...
to a file (#4640 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@11259 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 02:10:40 +00:00
567153e4fb
new file, a small idea
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11257 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 01:34:53 +00:00
508c5eb5bd
make monitor section an optional feature than can be added/removed as needed. this is a big commit, and breakage is possible. it has been moderately tested. this commit also locks the remote control ID of the master bus to 318 and the monitor section (if any) to 319. the numbers are based on MIDI Machine Control limits
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 01:30:44 +00:00
4b95a7912a
fix initial filling out of tempo bars|beats map after loading from XML by extending it (at least) to the last tempo/meter metric
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-17 22:32:25 +00:00
Carl Hetherington
7fcfe672c4
Fix unutterably terrible thinko in previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-17 16:54:09 +00:00
09f5369fea
add more debugging to track/spot/debug mis-use of BeatFramesConverter
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-17 05:27:22 +00:00
e2729c12a8
fix bug with tempo computation where passed in positions or offsets are negative
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11252 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-17 03:00:32 +00:00
Carl Hetherington
381346ba5f
Try to fix previous commit on 32-bit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 23:32:03 +00:00
Carl Hetherington
36ec03358f
Remove thought-to-be-unnecessary setup of Delivery::_no_outs_cuz_we_no_monitor
...
at the start of each cycle; it is set up at the start of Route::process_output_buffers.
git-svn-id: svn://localhost/ardour2/branches/3.0@11247 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 23:31:55 +00:00
Carl Hetherington
b087721d8a
Add some debug code to time things in the process
...
thread(s).
git-svn-id: svn://localhost/ardour2/branches/3.0@11246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 22:02:59 +00:00
Carl Hetherington
d4bab8aeed
Trim some lock / unlock cycles on the trigger mutex.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 22:02:26 +00:00
Carl Hetherington
6f795668b9
Remove unused variables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 22:02:14 +00:00
Carl Hetherington
af5f57d807
Fix use of rdtsc on 64-bit (I think).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-14 22:02:07 +00:00
d51f3e34b4
complete the do-not-free-data-from-getmntinfo() fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11232 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-11 18:14:18 +00:00
426cb79763
fix latency compensation for the click
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11226 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-11 14:36:46 +00:00
Carl Hetherington
39d41e46c5
Fix previous commit.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11225 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-10 23:51:47 +00:00
Carl Hetherington
08826bc432
Remove unused _process_callback method.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11223 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-10 23:39:39 +00:00
0c68a56ffb
remove some verbiage when creating audiofile sources
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-10 01:57:33 +00:00
9b99745c5a
fix auditioning (bystander casualty of monitoring fixes)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 22:25:18 +00:00
e7bb933477
fix nasty memory-related crashes caused by not noticing a bug in getmntinfo() on OS X, which disallows free()-ing memory allocated by that function
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 22:02:10 +00:00
4306fc7aee
change config dir on OS X to ~/Library/Preferences/Ardour3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 19:35:01 +00:00
34373c30f3
add MIDITrack specific ::monitoring_state() method
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11207 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 16:43:30 +00:00
d0d6a2015f
reduce Processor debug tag verbosity
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 16:43:09 +00:00
5bda71718e
remove some debug io from the Processors tag that is not really related to processors at all
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11204 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 16:11:40 +00:00
5f1ff657c2
another AU-specific tempo fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11203 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 16:10:59 +00:00
Carl Hetherington
9b975dce38
Fix typo.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11202 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-09 01:59:52 +00:00
c57db81068
don't allow/create non-beat aligned tempo changes in response to meter changes. round the position of a tempo change the earlier beat that it would have followed according to its bar_offset value
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 17:19:29 +00:00
985946b1a1
fix up a few zero-boundary condition errors in TempoMap
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 16:53:34 +00:00
0ddff57b50
sort debug options
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11194 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 16:38:49 +00:00
d3346d5466
tempo map debugging with dlp
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-08 16:20:54 +00:00
c85e251f0a
add operator!= for BBT_Time
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11188 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-07 17:11:17 +00:00
6b297a9928
when moving tempo and metric sections around (or adding new ones), prevent the existence of two tempo markers within the same beat, as well as two meter markers within the same bar (though i think this was prevented already by snapping meter sections to beat=1; make round_to_beats() work when dir==0 ("true rounding"); a bit of code cleanup
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-07 15:18:27 +00:00
ba00aba51c
fix positioning of grid line after a non-beat aligned tempo change
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-07 02:44:41 +00:00
6a154f9de6
a better fix for timestamping non-beat-aligned tempo changes
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-07 00:16:28 +00:00
d64d4a767d
remove extra TempoMap::dump() call
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 22:56:58 +00:00
c7b7cb9a31
re-adjust computation of non-beat aligned tempo change
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 22:50:34 +00:00
161c33a84f
adjust computation of non-beat aligned tempo change, and let TempoMap::dump() be used "wherever"
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 22:36:00 +00:00
28df3238c2
fix frame/beat walking to pass unit tests
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 20:29:41 +00:00
bfca00efd2
remove messages when tempo map is not available in RT context
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11175 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 20:29:18 +00:00
16063123f3
twiddle with one test explanation to help paul reason about it
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 20:28:40 +00:00
355183f1ab
partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-06 16:39:40 +00:00
bdb15f9422
fix some more crashes with tempo map manipulations
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11170 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 22:36:58 +00:00
c5205fe49f
upgrade audiounit support to use the new tempomap API
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11169 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 21:26:54 +00:00
9829a69549
fix over-zealous optimization in tempo map, caused crash
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11168 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 21:24:26 +00:00
862299120c
remove debugging output
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11167 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 17:42:48 +00:00
3678b7c962
make extending the tempo map O(N) in the section to be filled in, rather than O(N) in the overall length of the map, and clean up some other details
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 17:31:24 +00:00
63f77717d7
remove un-needed TempoMap::frame_time_rt()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11165 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 15:56:14 +00:00
e0b694f630
possibly fix deadlocking issues with tempo map by rearranging code and adding RT variants for a couple of functions that would normally try to rebuild the map when necessary; instead the variants throw an exception and the RT code that called them tries to do something reasonable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11164 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-05 05:05:31 +00:00
Carl Hetherington
4e4306d125
Use Request::Pause rather than Request::Wait for
...
Butler::wait_until_finished. Otherwise the following bad
thing happens:
1. The export code wants to call some Butler functions, so it calls
calls Butler::wait_until_finished.
2. This (used to) write Request::Wake into the butler's request pipe.
3. Imagine that when this happens, the butler is already doing stuff.
4. Meanwhile, Butler::wait_until_finished is waiting on Butler::paused.
5. Some time later, the butler finishes its other stuff.
6. Then it signals "paused".
7. This causes Butler::wait_until_finished to return, so the export code
thinks everything's ok and starts calling butler functions.
8. Then the butler sees the Request::Wake, wakes up, and by unhappy coincidence
ends up calling read on the same diskstream that the export code has just called.
This causes corruption of the Diskstream buffers, resulting in mantis #4283 .
Using Request::Pause instead means that the butler will still wake in step #8 ,
but should_run will be false, so nothing much will happen and the export code
will be unimpeded.
For future reference, this bug was easiest to track down after adding a debugging
mutex to AudioDiskstream and then try-locking it in AudioDiskstream::_do_refill;
as far as I can see, _do_refill should never be called by two threads at the
git-svn-id: svn://localhost/ardour2/branches/3.0@11163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 21:07:04 +00:00
d48fd2a679
try to clean up locking issues with TempoMap
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11161 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 20:29:56 +00:00
f61a0d892c
fix error in framepos_{plus,minus}_bbt() which miscounted beats while stepping through bars - stops dragged MIDI notes from ending up in the wrong place, and more
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 18:48:32 +00:00
2858b0474e
fix (?) tricky locking issues in the tempo map by adding a second lock and independently locking the metrics and the map itself
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 17:55:42 +00:00
Carl Hetherington
b9a9d8d047
Use a few shared_ptrs to make things slightly neater.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 13:56:09 +00:00
365a8f7f14
implement TempoMap::framepos_minus_beats() using new bar|beat map structure, and fix accuracy of TempoMap::framepos_plus_bbt()
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 03:27:55 +00:00
b1a33855ce
use BBTPoint::is_bar() rather than ::beat == 1 ; implement TempoMap::framepos_plus_{beats,bbt}() with new map structure (not totally finished or accurate yet); prevent crash when dragging a marker to replace the initial tempo/meter markers
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-04 02:49:01 +00:00
Carl Hetherington
10d9eaf0bd
Remove unused variables.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:13:16 +00:00
Carl Hetherington
2bea7aaca5
Maybe fix initial run of tests with sources.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:13:11 +00:00
Carl Hetherington
58d8b7f42f
Add valgrind option for tests.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11150 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:12:58 +00:00
Carl Hetherington
469d3b8fd7
Add TestNeedingPlaylistAndRegions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11149 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:12:53 +00:00
43441aa924
remove duplicated test conditions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 19:20:54 +00:00
bc003a539b
save 4 bytes per Bar|Beat point in the tempo map
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11147 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 19:03:13 +00:00
2a200bdc0e
return two iterators into the Bars|Beats list of the tempo map rather than making a copy; use iterators in the GUI
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 18:43:58 +00:00
