ardour/livetrax
13
0
Fork 0
Code

Fix undefined operations (according to gcc 4.5.2).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9153 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-03-15 01:19:43 +00:00
parent be3002c239
commit 04bb452e27
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/tempo.cc
View File

@ -1051,8 +1051,8 @@ TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, i
/* count beats */
while( b > when.beats ) {
result.bars = max(1U,result.bars-- ) ;
--result.bars;
result.bars = max(1U, result.bars);
metric = metric_at(result); // maybe there is a meter change
beats_per_bar = metric.meter().beats_per_bar();
if (b >= ceil(beats_per_bar)) {
@ -1076,13 +1076,14 @@ TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, i
do {
if (result.beats == 1) {
result.bars = max(1U, result.bars-- ) ;
--result.bars;
result.bars = max(1U, result.bars) ;
metric = metric_at(result); // maybe there is a meter change
beats_per_bar = metric.meter().beats_per_bar();
result.beats = (uint32_t) ceil(beats_per_bar);
ticks_at_beat = (uint32_t) ((1 - (ceil(beats_per_bar) - beats_per_bar)) * BBT_Time::ticks_per_beat) ;
} else {
result.beats --;
--result.beats;
ticks_at_beat = (uint32_t) BBT_Time::ticks_per_beat;
}