splashgui text clr, faders/speed keyframe popup slider rework, reticle rework

[goodguy/history.git] / cinelerra-5.1 / cinelerra / atrack.C

diff --git a/cinelerra-5.1/cinelerra/atrack.C b/cinelerra-5.1/cinelerra/atrack.C
index 9387ed9d4120e2154015c9fed922f8300dc69ae8..5ba270e69d928fd6b29e37bcbdeb2bdd1d455cc4 100644 (file)
--- a/cinelerra-5.1/cinelerra/atrack.C
+++ b/cinelerra-5.1/cinelerra/atrack.C
@@ -106,11 +106,9 @@ void ATrack::create_objects()
 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);
 }
 
@@ -139,10 +137,8 @@ void ATrack::set_default_title()
 
 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)