ardour.git
12 years agofix reload of session with new send naming in place, drop "aux-" prefix from name...
Paul Davis [Wed, 18 Jan 2012 18:37:26 +0000 (18:37 +0000)]
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

12 years agofix two major assert failures arising from the optional monitor section commit; separ...
Paul Davis [Wed, 18 Jan 2012 17:51:57 +0000 (17:51 +0000)]
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

12 years agominor edit (#4540)
Paul Davis [Wed, 18 Jan 2012 16:56:05 +0000 (16:56 +0000)]
minor edit (#4540)

git-svn-id: svn://localhost/ardour2/branches/3.0@11262 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoTweak labels (#4632).
Carl Hetherington [Wed, 18 Jan 2012 02:22:37 +0000 (02:22 +0000)]
Tweak labels (#4632).

git-svn-id: svn://localhost/ardour2/branches/3.0@11260 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoCatch exception thrown by SMF code when it cannot write
Carl Hetherington [Wed, 18 Jan 2012 02:10:40 +0000 (02:10 +0000)]
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

12 years agoMake contents of region properties dialogue expand with
Carl Hetherington [Wed, 18 Jan 2012 02:10:31 +0000 (02:10 +0000)]
Make contents of region properties dialogue expand with
the window (#4639).

git-svn-id: svn://localhost/ardour2/branches/3.0@11258 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agonew file, a small idea
Paul Davis [Wed, 18 Jan 2012 01:34:53 +0000 (01:34 +0000)]
new file, a small idea

git-svn-id: svn://localhost/ardour2/branches/3.0@11257 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agomake monitor section an optional feature than can be added/removed as needed. this...
Paul Davis [Wed, 18 Jan 2012 01:30:44 +0000 (01:30 +0000)]
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

12 years agofix initial filling out of tempo bars|beats map after loading from XML by extending...
Paul Davis [Tue, 17 Jan 2012 22:32:25 +0000 (22:32 +0000)]
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

12 years agoFix unutterably terrible thinko in previous commit.
Carl Hetherington [Tue, 17 Jan 2012 16:54:09 +0000 (16:54 +0000)]
Fix unutterably terrible thinko in previous commit.

git-svn-id: svn://localhost/ardour2/branches/3.0@11254 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd more debugging to track/spot/debug mis-use of BeatFramesConverter
Paul Davis [Tue, 17 Jan 2012 05:27:22 +0000 (05:27 +0000)]
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

12 years agofix bug with tempo computation where passed in positions or offsets are negative
Paul Davis [Tue, 17 Jan 2012 03:00:32 +0000 (03:00 +0000)]
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

12 years agoadjust to new template structure in OS X packaging tool (note: this was in place...
Paul Davis [Mon, 16 Jan 2012 14:52:10 +0000 (14:52 +0000)]
adjust to new template structure in OS X packaging tool (note: this was in place for 3.0-beta2 and used during packaging but not committed)

git-svn-id: svn://localhost/ardour2/branches/3.0@11250 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoTry to fix previous commit on 32-bit.
Carl Hetherington [Sat, 14 Jan 2012 23:32:03 +0000 (23:32 +0000)]
Try to fix previous commit on 32-bit.

git-svn-id: svn://localhost/ardour2/branches/3.0@11248 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoRemove thought-to-be-unnecessary setup of Delivery::_no_outs_cuz_we_no_monitor
Carl Hetherington [Sat, 14 Jan 2012 23:31:55 +0000 (23:31 +0000)]
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

12 years agoAdd some debug code to time things in the process
Carl Hetherington [Sat, 14 Jan 2012 22:02:59 +0000 (22:02 +0000)]
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

12 years agoTrim some lock / unlock cycles on the trigger mutex.
Carl Hetherington [Sat, 14 Jan 2012 22:02:26 +0000 (22:02 +0000)]
Trim some lock / unlock cycles on the trigger mutex.

git-svn-id: svn://localhost/ardour2/branches/3.0@11245 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoRemove unused variables.
Carl Hetherington [Sat, 14 Jan 2012 22:02:14 +0000 (22:02 +0000)]
Remove unused variables.

git-svn-id: svn://localhost/ardour2/branches/3.0@11244 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoFix use of rdtsc on 64-bit (I think).
Carl Hetherington [Sat, 14 Jan 2012 22:02:07 +0000 (22:02 +0000)]
Fix use of rdtsc on 64-bit (I think).

git-svn-id: svn://localhost/ardour2/branches/3.0@11243 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agocomplete the do-not-free-data-from-getmntinfo() fix
Paul Davis [Wed, 11 Jan 2012 18:14:18 +0000 (18:14 +0000)]
complete the do-not-free-data-from-getmntinfo() fix

git-svn-id: svn://localhost/ardour2/branches/3.0@11232 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix GTK_PATH in binary bundle (not fully tested)
Paul Davis [Wed, 11 Jan 2012 17:15:54 +0000 (17:15 +0000)]
fix GTK_PATH in binary bundle (not fully tested)

git-svn-id: svn://localhost/ardour2/branches/3.0@11229 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix latency compensation for the click
Paul Davis [Wed, 11 Jan 2012 14:36:46 +0000 (14:36 +0000)]
fix latency compensation for the click

git-svn-id: svn://localhost/ardour2/branches/3.0@11226 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoFix previous commit.
Carl Hetherington [Tue, 10 Jan 2012 23:51:47 +0000 (23:51 +0000)]
Fix previous commit.

git-svn-id: svn://localhost/ardour2/branches/3.0@11225 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoReinstate command line option to hide splash screen.
Carl Hetherington [Tue, 10 Jan 2012 23:42:42 +0000 (23:42 +0000)]
Reinstate command line option to hide splash screen.

git-svn-id: svn://localhost/ardour2/branches/3.0@11224 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoRemove unused _process_callback method.
Carl Hetherington [Tue, 10 Jan 2012 23:39:39 +0000 (23:39 +0000)]
Remove unused _process_callback method.

git-svn-id: svn://localhost/ardour2/branches/3.0@11223 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agothe return of the splash, with a few changes to help with window layering a little
Paul Davis [Tue, 10 Jan 2012 18:21:39 +0000 (18:21 +0000)]
the return of the splash, with a few changes to help with window layering a little

git-svn-id: svn://localhost/ardour2/branches/3.0@11222 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agochange tooltip of automation button for MIDI tracks to give hint that its also about...
Paul Davis [Tue, 10 Jan 2012 15:53:33 +0000 (15:53 +0000)]
change tooltip of automation button for MIDI tracks to give hint that its also about controllers

git-svn-id: svn://localhost/ardour2/branches/3.0@11221 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoReplace images with not washed out ones.
Carl Hetherington [Tue, 10 Jan 2012 15:20:54 +0000 (15:20 +0000)]
Replace images with not washed out ones.

git-svn-id: svn://localhost/ardour2/branches/3.0@11220 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoMissing screenshots.
Carl Hetherington [Tue, 10 Jan 2012 14:51:04 +0000 (14:51 +0000)]
Missing screenshots.

git-svn-id: svn://localhost/ardour2/branches/3.0@11219 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove some verbiage when creating audiofile sources 3.0-beta2
Paul Davis [Tue, 10 Jan 2012 01:57:33 +0000 (01:57 +0000)]
remove some verbiage when creating audiofile sources

git-svn-id: svn://localhost/ardour2/branches/3.0@11213 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix auditioning (bystander casualty of monitoring fixes)
Paul Davis [Mon, 9 Jan 2012 22:25:18 +0000 (22:25 +0000)]
fix auditioning (bystander casualty of monitoring fixes)

git-svn-id: svn://localhost/ardour2/branches/3.0@11212 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix nasty memory-related crashes caused by not noticing a bug in getmntinfo() on...
Paul Davis [Mon, 9 Jan 2012 22:02:10 +0000 (22:02 +0000)]
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

12 years agochange config dir on OS X to ~/Library/Preferences/Ardour3
Paul Davis [Mon, 9 Jan 2012 19:35:01 +0000 (19:35 +0000)]
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

12 years agochange default binding for import to be PRIMARY-i because its really an action not...
Paul Davis [Mon, 9 Jan 2012 19:34:28 +0000 (19:34 +0000)]
change default binding for import to be PRIMARY-i because its really an action not a window

git-svn-id: svn://localhost/ardour2/branches/3.0@11209 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoDon't redraw the summary every time the playhead moves (if it hasn't moved visibly...
Carl Hetherington [Mon, 9 Jan 2012 18:03:49 +0000 (18:03 +0000)]
Don't redraw the summary every time the playhead moves (if it hasn't moved visibly on the summary), and only redraw the bit that has changed when it does happen.

git-svn-id: svn://localhost/ardour2/branches/3.0@11208 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd MIDITrack specific ::monitoring_state() method
Paul Davis [Mon, 9 Jan 2012 16:43:30 +0000 (16:43 +0000)]
add MIDITrack specific ::monitoring_state() method

git-svn-id: svn://localhost/ardour2/branches/3.0@11207 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoreduce Processor debug tag verbosity
Paul Davis [Mon, 9 Jan 2012 16:43:09 +0000 (16:43 +0000)]
reduce Processor debug tag verbosity

git-svn-id: svn://localhost/ardour2/branches/3.0@11206 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agouse system/gtk default font on OS X, rather than specifying Lucida Grande; make large...
Paul Davis [Mon, 9 Jan 2012 16:13:16 +0000 (16:13 +0000)]
use system/gtk default font on OS X, rather than specifying Lucida Grande; make large_bold_text use the LARGE size, not BIGGER

git-svn-id: svn://localhost/ardour2/branches/3.0@11205 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove some debug io from the Processors tag that is not really related to processors...
Paul Davis [Mon, 9 Jan 2012 16:11:40 +0000 (16:11 +0000)]
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

12 years agoanother AU-specific tempo fix
Paul Davis [Mon, 9 Jan 2012 16:10:59 +0000 (16:10 +0000)]
another AU-specific tempo fix

git-svn-id: svn://localhost/ardour2/branches/3.0@11203 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoFix typo.
Carl Hetherington [Mon, 9 Jan 2012 01:59:52 +0000 (01:59 +0000)]
Fix typo.

git-svn-id: svn://localhost/ardour2/branches/3.0@11202 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoAccount for ProcessorEntry::_processor being 0 in a few places; remove unused Process...
Carl Hetherington [Mon, 9 Jan 2012 01:33:24 +0000 (01:33 +0000)]
Account for ProcessorEntry::_processor being 0 in a few places; remove unused ProcessorBox::build_processor_tooltip.

git-svn-id: svn://localhost/ardour2/branches/3.0@11201 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoRemove an unnecessary assert that now trips.
Carl Hetherington [Sun, 8 Jan 2012 20:27:34 +0000 (20:27 +0000)]
Remove an unnecessary assert that now trips.

git-svn-id: svn://localhost/ardour2/branches/3.0@11200 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agodon't allow/create non-beat aligned tempo changes in response to meter changes. round...
Paul Davis [Sun, 8 Jan 2012 17:19:29 +0000 (17:19 +0000)]
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

12 years agodon't hide the "auto" box transport bar buttons (sync, auto-return etc) if the screen...
Paul Davis [Sun, 8 Jan 2012 17:14:31 +0000 (17:14 +0000)]
don't hide the "auto" box transport bar buttons (sync, auto-return etc) if the screen is small

git-svn-id: svn://localhost/ardour2/branches/3.0@11197 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix up a few zero-boundary condition errors in TempoMap
Paul Davis [Sun, 8 Jan 2012 16:53:34 +0000 (16:53 +0000)]
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

12 years agosimplify and legalize call to TempoMap::get_grid() when getting grid points
Paul Davis [Sun, 8 Jan 2012 16:53:11 +0000 (16:53 +0000)]
simplify and legalize call to TempoMap::get_grid() when getting grid points

git-svn-id: svn://localhost/ardour2/branches/3.0@11195 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agosort debug options
Paul Davis [Sun, 8 Jan 2012 16:38:49 +0000 (16:38 +0000)]
sort debug options

git-svn-id: svn://localhost/ardour2/branches/3.0@11194 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agotempo map debugging with dlp
Paul Davis [Sun, 8 Jan 2012 16:20:54 +0000 (16:20 +0000)]
tempo map debugging with dlp

git-svn-id: svn://localhost/ardour2/branches/3.0@11193 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd operator!= for BBT_Time
Paul Davis [Sat, 7 Jan 2012 17:11:17 +0000 (17:11 +0000)]
add operator!= for BBT_Time

git-svn-id: svn://localhost/ardour2/branches/3.0@11188 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd an empty ProcessorEntry before the fader if there are no pre-fader processors...
Paul Davis [Sat, 7 Jan 2012 17:10:18 +0000 (17:10 +0000)]
add an empty ProcessorEntry before the fader if there are no pre-fader processors, to strongly visually indicate that you can insert new processors there; add back a fixed, static tooltip for the processor box

git-svn-id: svn://localhost/ardour2/branches/3.0@11187 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd sixteenths as note type for tempo and meter; fix cursor color, selection color...
Paul Davis [Sat, 7 Jan 2012 15:28:58 +0000 (15:28 +0000)]
add sixteenths as note type for tempo and meter; fix cursor color, selection color etc, for tempo & meter dialogs

git-svn-id: svn://localhost/ardour2/branches/3.0@11186 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agowhen moving tempo and metric sections around (or adding new ones), prevent the existe...
Paul Davis [Sat, 7 Jan 2012 15:18:27 +0000 (15:18 +0000)]
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

12 years agorest of the color change for the MIDI channel selector, missed this yesterday
Paul Davis [Sat, 7 Jan 2012 15:10:54 +0000 (15:10 +0000)]
rest of the color change for the MIDI channel selector, missed this yesterday

git-svn-id: svn://localhost/ardour2/branches/3.0@11184 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agosnap tempo marker drags to the nearest beat
Paul Davis [Sat, 7 Jan 2012 15:10:31 +0000 (15:10 +0000)]
snap tempo marker drags to the nearest beat

git-svn-id: svn://localhost/ardour2/branches/3.0@11183 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix positioning of grid line after a non-beat aligned tempo change
Paul Davis [Sat, 7 Jan 2012 02:44:41 +0000 (02:44 +0000)]
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

12 years agoa better fix for timestamping non-beat-aligned tempo changes
Paul Davis [Sat, 7 Jan 2012 00:16:28 +0000 (00:16 +0000)]
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

12 years agoremove extra TempoMap::dump() call
Paul Davis [Fri, 6 Jan 2012 22:56:58 +0000 (22:56 +0000)]
remove extra TempoMap::dump() call

git-svn-id: svn://localhost/ardour2/branches/3.0@11180 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agore-adjust computation of non-beat aligned tempo change
Paul Davis [Fri, 6 Jan 2012 22:50:34 +0000 (22:50 +0000)]
re-adjust computation of non-beat aligned tempo change

git-svn-id: svn://localhost/ardour2/branches/3.0@11179 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadjust computation of non-beat aligned tempo change, and let TempoMap::dump() be...
Paul Davis [Fri, 6 Jan 2012 22:36:00 +0000 (22:36 +0000)]
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

12 years agofix frame/beat walking to pass unit tests
Paul Davis [Fri, 6 Jan 2012 20:29:41 +0000 (20:29 +0000)]
fix frame/beat walking to pass unit tests

git-svn-id: svn://localhost/ardour2/branches/3.0@11176 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove messages when tempo map is not available in RT context
Paul Davis [Fri, 6 Jan 2012 20:29:18 +0000 (20:29 +0000)]
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

12 years agotwiddle with one test explanation to help paul reason about it
Paul Davis [Fri, 6 Jan 2012 20:28:40 +0000 (20:28 +0000)]
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

12 years agodull down the MIDI channel selector buttons to avoid sensory overload
Paul Davis [Fri, 6 Jan 2012 19:18:09 +0000 (19:18 +0000)]
dull down the MIDI channel selector buttons to avoid sensory overload

git-svn-id: svn://localhost/ardour2/branches/3.0@11172 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agopartially revert some of the recent work on tempo to reflect new understanding of...
Paul Davis [Fri, 6 Jan 2012 16:39:40 +0000 (16:39 +0000)]
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

12 years agofix some more crashes with tempo map manipulations
Paul Davis [Thu, 5 Jan 2012 22:36:58 +0000 (22:36 +0000)]
fix some more crashes with tempo map manipulations

git-svn-id: svn://localhost/ardour2/branches/3.0@11170 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoupgrade audiounit support to use the new tempomap API
Paul Davis [Thu, 5 Jan 2012 21:26:54 +0000 (21:26 +0000)]
upgrade audiounit support to use the new tempomap API

git-svn-id: svn://localhost/ardour2/branches/3.0@11169 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix over-zealous optimization in tempo map, caused crash
Paul Davis [Thu, 5 Jan 2012 21:24:26 +0000 (21:24 +0000)]
fix over-zealous optimization in tempo map, caused crash

git-svn-id: svn://localhost/ardour2/branches/3.0@11168 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove debugging output
Paul Davis [Thu, 5 Jan 2012 17:42:48 +0000 (17:42 +0000)]
remove debugging output

git-svn-id: svn://localhost/ardour2/branches/3.0@11167 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agomake extending the tempo map O(N) in the section to be filled in, rather than O(N...
Paul Davis [Thu, 5 Jan 2012 17:31:24 +0000 (17:31 +0000)]
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

12 years agoremove un-needed TempoMap::frame_time_rt()
Paul Davis [Thu, 5 Jan 2012 15:56:14 +0000 (15:56 +0000)]
remove un-needed TempoMap::frame_time_rt()

git-svn-id: svn://localhost/ardour2/branches/3.0@11165 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agopossibly fix deadlocking issues with tempo map by rearranging code and adding RT...
Paul Davis [Thu, 5 Jan 2012 05:05:31 +0000 (05:05 +0000)]
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

12 years agoUse Request::Pause rather than Request::Wait for
Carl Hetherington [Wed, 4 Jan 2012 21:07:04 +0000 (21:07 +0000)]
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

12 years agorestore correct behaviour of undo/redo for tempo map drags
Paul Davis [Wed, 4 Jan 2012 20:40:06 +0000 (20:40 +0000)]
restore correct behaviour of undo/redo for tempo map drags

git-svn-id: svn://localhost/ardour2/branches/3.0@11162 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agotry to clean up locking issues with TempoMap
Paul Davis [Wed, 4 Jan 2012 20:29:56 +0000 (20:29 +0000)]
try to clean up locking issues with TempoMap

git-svn-id: svn://localhost/ardour2/branches/3.0@11161 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agotweak constants that affect whether/where trimming cursors are shown for MIDI notes...
Paul Davis [Wed, 4 Jan 2012 20:29:34 +0000 (20:29 +0000)]
tweak constants that affect whether/where trimming cursors are shown for MIDI notes, to avoid making it so hard to drag relatively small notes

git-svn-id: svn://localhost/ardour2/branches/3.0@11160 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix error in framepos_{plus,minus}_bbt() which miscounted beats while stepping throug...
Paul Davis [Wed, 4 Jan 2012 18:48:32 +0000 (18:48 +0000)]
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

12 years agofix (?) tricky locking issues in the tempo map by adding a second lock and independen...
Paul Davis [Wed, 4 Jan 2012 17:55:42 +0000 (17:55 +0000)]
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

12 years agoUse a few shared_ptrs to make things slightly neater.
Carl Hetherington [Wed, 4 Jan 2012 13:56:09 +0000 (13:56 +0000)]
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

12 years agoimplement TempoMap::framepos_minus_beats() using new bar|beat map structure, and...
Paul Davis [Wed, 4 Jan 2012 03:27:55 +0000 (03:27 +0000)]
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

12 years agouse BBTPoint::is_bar() rather than ::beat == 1 ; implement TempoMap::framepos_plus_...
Paul Davis [Wed, 4 Jan 2012 02:49:01 +0000 (02:49 +0000)]
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

12 years agoRemove unused variables.
Carl Hetherington [Tue, 3 Jan 2012 21:13:16 +0000 (21:13 +0000)]
Remove unused variables.

git-svn-id: svn://localhost/ardour2/branches/3.0@11153 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoMaybe fix initial run of tests with sources.
Carl Hetherington [Tue, 3 Jan 2012 21:13:11 +0000 (21:13 +0000)]
Maybe fix initial run of tests with sources.

git-svn-id: svn://localhost/ardour2/branches/3.0@11152 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoHappy New Year
Carl Hetherington [Tue, 3 Jan 2012 21:13:05 +0000 (21:13 +0000)]
Happy New Year

git-svn-id: svn://localhost/ardour2/branches/3.0@11151 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoAdd valgrind option for tests.
Carl Hetherington [Tue, 3 Jan 2012 21:12:58 +0000 (21:12 +0000)]
Add valgrind option for tests.

git-svn-id: svn://localhost/ardour2/branches/3.0@11150 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoAdd TestNeedingPlaylistAndRegions
Carl Hetherington [Tue, 3 Jan 2012 21:12:53 +0000 (21:12 +0000)]
Add TestNeedingPlaylistAndRegions

git-svn-id: svn://localhost/ardour2/branches/3.0@11149 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove duplicated test conditions
Paul Davis [Tue, 3 Jan 2012 19:20:54 +0000 (19:20 +0000)]
remove duplicated test conditions

git-svn-id: svn://localhost/ardour2/branches/3.0@11148 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agosave 4 bytes per Bar|Beat point in the tempo map
Paul Davis [Tue, 3 Jan 2012 19:03:13 +0000 (19:03 +0000)]
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

12 years agoreturn two iterators into the Bars|Beats list of the tempo map rather than making...
Paul Davis [Tue, 3 Jan 2012 18:43:58 +0000 (18:43 +0000)]
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

12 years agomore tempo fixes, including handling multiple metrics at the same place, and fixing...
Paul Davis [Tue, 3 Jan 2012 17:59:47 +0000 (17:59 +0000)]
more tempo fixes, including handling multiple metrics at the same place, and fixing round_to_beat_subdivision(). almost done now...

git-svn-id: svn://localhost/ardour2/branches/3.0@11145 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agofix incorrect tempo test
Paul Davis [Tue, 3 Jan 2012 17:58:46 +0000 (17:58 +0000)]
fix incorrect tempo test

git-svn-id: svn://localhost/ardour2/branches/3.0@11144 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoremove body of no-longer-relevant tempo-related test
Paul Davis [Tue, 3 Jan 2012 17:36:40 +0000 (17:36 +0000)]
remove body of no-longer-relevant tempo-related test

git-svn-id: svn://localhost/ardour2/branches/3.0@11143 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoadd support for -D foobar when running tests
Paul Davis [Tue, 3 Jan 2012 17:36:17 +0000 (17:36 +0000)]
add support for -D foobar when running tests

git-svn-id: svn://localhost/ardour2/branches/3.0@11142 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoAdd notes on running unit tests.
Carl Hetherington [Tue, 3 Jan 2012 16:10:34 +0000 (16:10 +0000)]
Add notes on running unit tests.

git-svn-id: svn://localhost/ardour2/branches/3.0@11141 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoAdd TestNeedingSession and add missing tempo_test.h
Carl Hetherington [Tue, 3 Jan 2012 16:05:25 +0000 (16:05 +0000)]
Add TestNeedingSession and add missing tempo_test.h

git-svn-id: svn://localhost/ardour2/branches/3.0@11140 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoNew test.
Carl Hetherington [Tue, 3 Jan 2012 14:32:51 +0000 (14:32 +0000)]
New test.

git-svn-id: svn://localhost/ardour2/branches/3.0@11139 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoMore test friends.
Carl Hetherington [Tue, 3 Jan 2012 14:32:22 +0000 (14:32 +0000)]
More test friends.

git-svn-id: svn://localhost/ardour2/branches/3.0@11138 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoReverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
Carl Hetherington [Tue, 3 Jan 2012 14:32:17 +0000 (14:32 +0000)]
Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
messages read the right way round.

git-svn-id: svn://localhost/ardour2/branches/3.0@11137 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoFix erroneous test.
Carl Hetherington [Tue, 3 Jan 2012 14:32:12 +0000 (14:32 +0000)]
Fix erroneous test.

git-svn-id: svn://localhost/ardour2/branches/3.0@11136 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 years agoRemove unused variables.
Carl Hetherington [Tue, 3 Jan 2012 14:32:07 +0000 (14:32 +0000)]
Remove unused variables.

git-svn-id: svn://localhost/ardour2/branches/3.0@11135 d708f5d6-7413-0410-9779-e7cbd77b26cf