fix histogram bez keyframe interp, update plugins/fonts/fonts.scale, edl copy clip...

[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 ed9df7b90105614a2f726cea39bab7a66a8c61bb..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)
@@ -177,15 +173,3 @@ int ATrack::paste_derived(int64_t start, int64_t end, int64_t total_length, File
        return 0;
 }
 
-void ATrack::deglitch(double position, 
-       int edit_labels, int edit_plugins, int edit_autos)
-{
-       int64_t samples = to_units(position, 0);
-       edits->deglitch(samples);
-       if( edit_plugins ) {
-               for(int i = 0; i < plugin_set.size(); i++) {
-                       plugin_set.get(i)->deglitch(samples);
-               }
-       }
-}
-