bootstrap cinfinity picons, rework picon access, chaninfo tweak

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

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index 18ca87d1950c9a2e8fa7fd0ace95f4a46e373025..9fdf4f63fd66d4df71f2ea04d151971f09979c9a 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracksedit.C
+++ b/cinelerra-5.1/cinelerra/tracksedit.C
@@ -61,10 +61,10 @@ int Tracks::clear(double start, double end, int clear_plugins, int edit_autos)
                                end,
                                1, // edits
                                1, // labels
-                               clear_plugins,
+                               clear_plugins, // edit_plugins
                                edit_autos,
-                               1,
-                               0);
+                               1, // convert_units
+                               0); // trim_edits
                }
        }
        return 0;
@@ -623,6 +623,9 @@ void Tracks::move_edits(ArrayList<Edit*> *edits,
                                {
                                // This works like this: CUT edit, INSERT edit at final position, keyframes also follow
                                // FIXME: there should be a GUI way to tell whenever user also wants to move autos or not
+// this is all screwed up
+//  inserts defaults/bogus everywhere
+#if 0
 // Copy keyframes
                                        FileXML temp;
                                        AutoConf temp_autoconf;
@@ -655,7 +658,7 @@ void Tracks::move_edits(ArrayList<Edit*> *edits,
                                                dest_track->automation->paste(position_a,
                                                        source_length, 1.0, &temp, 0, 1,
                                                        &temp_autoconf);
-
+#endif
 // Insert new edit
                                        Edit *dest_edit = dest_track->edits->shift(position_i,
                                                source_length);