clip folder bug on reload, expander user folder drag/drop segv, remove libfdk src...

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

diff --git a/cinelerra-5.1/cinelerra/keyframes.C b/cinelerra-5.1/cinelerra/keyframes.C
index b2b33bef5700646e6153a4f6dcd53f8cd9709acc..696c8068387ec4ac3c16c58ddb2f0d563fe8122d 100644 (file)
--- a/cinelerra-5.1/cinelerra/keyframes.C
+++ b/cinelerra-5.1/cinelerra/keyframes.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "bchash.h"
@@ -80,98 +80,49 @@ KeyFrame* KeyFrames::get_prev_keyframe(int64_t position,
 
 KeyFrame* KeyFrames::get_keyframe()
 {
+       int64_t pos = track->to_units(edl->local_session->get_selectionstart(1), 0);
 // Search for keyframe on or before selection
-       KeyFrame *result = 
-               get_prev_keyframe(
-                       track->to_units(edl->local_session->get_selectionstart(1), 0), 
-                       PLAY_FORWARD);
-
-// Return nearest keyframe if not in automatic keyframe generation
-       if(!edl->session->auto_keyframes)
-       {
-               return result;
-       }
-       else
-// Return new keyframe
-       if(result == (KeyFrame*)default_auto || 
-               result->position != track->to_units(edl->local_session->get_selectionstart(1), 0))
-       {
-               return (KeyFrame*)insert_auto(track->to_units(edl->local_session->get_selectionstart(1), 0));
+       KeyFrame *result = get_prev_keyframe(pos, PLAY_FORWARD);
+       if( edl->session->auto_keyframes ) {
+               if( !result || result->position != pos ||
+                   result == (KeyFrame*)default_auto )
+// generate keyframes while tweeking, and no keyframe found at pos
+                       result = (KeyFrame*)insert_auto(pos);
        }
-       else
-// Return existing keyframe
-       {
-               return result;
-       }
-
-       return 0;
+       return result;
 }
 
 
 void KeyFrames::update_parameter(KeyFrame *src)
 {
-       const int debug = 0;
 // Create new keyframe if auto keyframes or replace entire keyframe.
        double selection_start = edl->local_session->get_selectionstart(0);
        double selection_end = edl->local_session->get_selectionend(0);
        selection_start = edl->align_to_frame(selection_start, 0);
        selection_end = edl->align_to_frame(selection_end, 0);
 
-       if(EQUIV(selection_start, selection_end))
-       {
-// Search for keyframe to write to
+       if( EQUIV(selection_start, selection_end) ) {
+// Search for keyframe to write
                KeyFrame *dst = get_keyframe();
-               
                dst->copy_data(src);
        }
-       else
+       else {
 // Replace changed parameter in all selected keyframes.
-       {
                BC_Hash *params = 0;
-               char *text = 0;
-               char *extra = 0;
-
-
+               char *text = 0, *extra = 0;
 // Search all keyframes in selection but don't create a new one.
                int64_t start = track->to_units(selection_start, 0);
                int64_t end = track->to_units(selection_end, 0);
-               KeyFrame *current = get_prev_keyframe(
-                               start, 
-                               PLAY_FORWARD);
-
+               KeyFrame *current = get_prev_keyframe(start, PLAY_FORWARD);
 // The first one determines the changed parameters since it is the one displayed
-// in the GUI.
-               current->get_diff(src,
-                       &params, 
-                       &text,
-                       &extra);
-
-
-if(debug) printf("KeyFrames::update_parameter %d params=%p position=%jd start=%jd\n", 
-  __LINE__,  params, current->position, track->to_units(start, 0));
-
-if(debug && params)
-{
-for(int i = 0; i < params->size(); i++)
-printf("KeyFrames::update_parameter %d changed=%s %s\n", 
-__LINE__,  
-params->get_key(i),
-params->get_value(i));
-}
-
+               current->get_diff(src, &params, &text, &extra);
 // Always update the first one
-               current->update_parameter(params, 
-                       text,
-                       extra);
-               for(current = (KeyFrame*)NEXT ; current && current->position < end; current = (KeyFrame*)NEXT)
-               {
-if(debug) printf("KeyFrames::update_parameter %d position=%jd\n", 
-  __LINE__, current->position);
-                       current->update_parameter(params, 
-                               text,
-                               extra);
+               current->update_parameter(params, text, extra);
+
+               for( current = (KeyFrame*)NEXT; current;  current = (KeyFrame*)NEXT ) {
+                       if( current->position >= end ) break;
+                       current->update_parameter(params, text, extra);
                }
-               
                delete params;
                delete [] text,
                delete [] extra;