ardour/livetrax
13
0
Fork 0
Code

Remove unused variables.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11135 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-01-03 14:32:07 +00:00
parent c9ed7d2402
commit 279d0ff34b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/tempo.cc
View File

@ -777,7 +777,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
MeterSection* ms; MeterSection* ms;
double divisions_per_bar; double divisions_per_bar;
double beat_frames; double beat_frames;
double frames_per_bar;
double current_frame; double current_frame;
BBT_Time current; BBT_Time current;
Metrics::iterator next_metric; Metrics::iterator next_metric;
@ -820,12 +819,10 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
current.ticks = 0; current.ticks = 0;
divisions_per_bar = meter->divisions_per_bar (); divisions_per_bar = meter->divisions_per_bar ();
frames_per_bar = meter->frames_per_bar (*tempo, _frame_rate);
beat_frames = meter->frames_per_division (*tempo,_frame_rate); beat_frames = meter->frames_per_division (*tempo,_frame_rate);
if (reassign_tempo_bbt) { if (reassign_tempo_bbt) {
TempoSection* rtempo = tempo;
MeterSection* rmeter = meter; MeterSection* rmeter = meter;
DEBUG_TRACE (DEBUG::TempoMath, "\tUpdating tempo marks BBT time from bar offset\n"); DEBUG_TRACE (DEBUG::TempoMath, "\tUpdating tempo marks BBT time from bar offset\n");
@ -839,7 +836,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
*/ */
ts->update_bbt_time_from_bar_offset (*rmeter); ts->update_bbt_time_from_bar_offset (*rmeter);
rtempo = ts;
} else if ((ms = dynamic_cast<MeterSection*>(*i)) != 0) { } else if ((ms = dynamic_cast<MeterSection*>(*i)) != 0) {
rmeter = ms; rmeter = ms;
@ -936,7 +932,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
} }
divisions_per_bar = meter->divisions_per_bar (); divisions_per_bar = meter->divisions_per_bar ();
frames_per_bar = meter->frames_per_bar (*tempo, _frame_rate);
beat_frames = meter->frames_per_division (*tempo, _frame_rate); beat_frames = meter->frames_per_division (*tempo, _frame_rate);
DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n", DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n",
@ -1339,6 +1334,10 @@ TempoMap::round_to_type (framepos_t frame, int dir, BBTPointType type)
} }
break; break;
} }
/* NOTREACHED */
assert (false);
return 0;
} }
void void