int ATrack::vertical_span(Theme *theme)
{
int track_h = Track::vertical_span(theme);
- int patch_h = 0;
- if(expand_view)
- {
- patch_h += theme->title_h + theme->play_h + theme->fade_h + theme->meter_h + theme->pan_h;
- }
+ int patch_h = theme->title_h;
+ if( expand_view )
+ patch_h += theme->play_h + theme->fade_h + theme->meter_h + theme->pan_h;
return MAX(track_h, patch_h);
}
int64_t ATrack::to_units(double position, int round)
{
- if(round)
- return Units::round(position * edl->session->sample_rate);
- else
- return Units::to_int64(position * edl->session->sample_rate);
+ return round ? Units::round(position * edl->session->sample_rate) :
+ Units::to_int64(position * edl->session->sample_rate + 1e-6);
}
double ATrack::to_doubleunits(double position)