smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-27 17:07:40 +01:00
Code Issues Projects Releases Wiki Activity
7732 commits 103 branches 145 tags 316 MiB
Commit graph

3709 commits

Author SHA1 Message Date
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
0d4658e0af 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
 2012-01-03 17:59:47 +00:00
Paul Davis
19126ddc09 fix incorrect tempo test 
git-svn-id: svn://localhost/ardour2/branches/3.0@11144 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 17:58:46 +00:00
Paul Davis
ce5de59c77 remove body of no-longer-relevant tempo-related test 
git-svn-id: svn://localhost/ardour2/branches/3.0@11143 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 17:36:40 +00:00
Paul Davis
d6ff0e35d8 add support for -D foobar when running tests 
git-svn-id: svn://localhost/ardour2/branches/3.0@11142 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 17:36:17 +00:00
Carl Hetherington
b6438ed1f6 Add TestNeedingSession and add missing tempo_test.h 
git-svn-id: svn://localhost/ardour2/branches/3.0@11140 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 16:05:25 +00:00
Carl Hetherington
dd57700445 New test. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11139 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:32:51 +00:00
Carl Hetherington
b0577f260c More test friends. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11138 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:32:22 +00:00
Carl Hetherington
d345d44688 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
 2012-01-03 14:32:17 +00:00
Carl Hetherington
e11c96019a Fix erroneous test. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11136 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:32:12 +00:00
Carl Hetherington
279d0ff34b Remove unused variables. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11135 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:32:07 +00:00
Carl Hetherington
c9ed7d2402 Fix test build. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11134 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:32:01 +00:00
Carl Hetherington
c252d65f56 Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert 
messages read the right way round.


git-svn-id: svn://localhost/ardour2/branches/3.0@11133 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 14:31:55 +00:00
Carl Hetherington
8be724db1b Use the correct flag for DAZ and default to using FTZ and DAZ denormal protection. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11132 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-02 23:52:28 +00:00
Paul Davis
f135947606 intermediate commit as all tempo/meter stuff starts to walk the precompute Bars|Beats list. Still have ::round_to_beat_subdivision() to fix. haven't really done any thorough testing at this point, but basic stuff seems OK 
git-svn-id: svn://localhost/ardour2/branches/3.0@11131 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-02 23:32:33 +00:00