ffplugin default opts now are unspecified, menubar pulldowns persist on leave notify

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

diff --git a/cinelerra-5.1/cinelerra/autos.C b/cinelerra-5.1/cinelerra/autos.C
index 0ca1efcf85d52a45942e3a9f376a8c17daa3c32c..49a8ea1cdc6674f8afd5c6b07cb635298349dad7 100644 (file)
--- a/cinelerra-5.1/cinelerra/autos.C
+++ b/cinelerra-5.1/cinelerra/autos.C
@@ -288,12 +288,11 @@ Auto* Autos::get_auto_for_editing(double position)
 
        Auto *result = 0;
        get_prev_auto(track->to_units(position, 0), PLAY_FORWARD, result);
+       if( edl->session->auto_keyframes && (!result || result->is_default ||
+              !EQUIV(track->from_units(result->position), position)) ) {
 //printf("Autos::get_auto_for_editing %p %p %p\n", default_auto, first, result);
-       if( !result || !EQUIV(track->from_units(result->position), position) ) {
-               if( edl->session->auto_keyframes ) {
-                       position = edl->align_to_frame(position, 0);
-                       result = insert_auto(track->to_units(position, 0));
-               }
+               position = edl->align_to_frame(position, 0);
+               result = insert_auto(track->to_units(position, 0));
        }
 //printf("Autos::get_auto_for_editing %p %p\n", first, default_auto);
 
@@ -704,22 +703,14 @@ Auto* Autos::autoof(int64_t position)
 Auto* Autos::nearest_before(int64_t position)
 {
        Auto *current;
-
-       for(current = last; current && current->position >= position; current = PREVIOUS)
-       { ; }
-
-
+       for(current = last; current && current->position >= position; current = PREVIOUS);
        return current;     // return 0 on failure
 }
 
 Auto* Autos::nearest_after(int64_t position)
 {
        Auto *current;
-
-       for(current = first; current && current->position <= position; current = NEXT)
-       { ; }
-
-
+       for(current = first; current && current->position <= position; current = NEXT);
        return current;     // return 0 on failure
 }