add sliders to cwdw proj/cam tools, edit id tweaks, deltrk shortcut tweak

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / edit.h

diff --git a/cinelerra-5.1/cinelerra/edit.h b/cinelerra-5.1/cinelerra/edit.h
index ff045fd0dc9bba69fea3c4dadb3c7aa21a09dc72..51cdb7a2e2c7a3aaeada849309df8bbf774496b7 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.h
+++ b/cinelerra-5.1/cinelerra/edit.h
@@ -54,13 +54,12 @@ public:
        Indexable* get_source();
 // Copy from different EDL
        virtual void copy_from(Edit *edit);
+       virtual void clone_from(Edit *edit);
 // Compare with edit in same EDL
        virtual int identical(Edit &edit);
-       virtual Edit& operator=(Edit& edit);
 // Called by Edits and PluginSet.
 // Compare with edit in different EDL
        virtual void equivalent_output(Edit *edit, int64_t *result);
-       virtual int operator==(Edit& edit);
 // When inherited by a plugin need to resample keyframes
        virtual void synchronize_params(Edit *edit);
 // Used by Edits::insert_edits to shift plugin keyframes
@@ -77,38 +76,15 @@ public:
 
 // Shift in time
        virtual void shift(int64_t difference);
-       int shift_start_in(int edit_mode,
-               int64_t newposition,
-               int64_t oldposition,
-               int edit_edits,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos,
-               Edits *trim_edits);
-       int shift_start_out(int edit_mode,
-               int64_t newposition,
-               int64_t oldposition,
-               int edit_edits,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos,
-               Edits *trim_edits);
-       int shift_end_in(int edit_mode,
-               int64_t newposition,
-               int64_t oldposition,
-               int edit_edits,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos,
-               Edits *trim_edits);
-       int shift_end_out(int edit_mode,
-               int64_t newposition,
-               int64_t oldposition,
-               int edit_edits,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos,
-               Edits *trim_edits);
+
+       void trim(int64_t difference);
+       int shift_start(int edit_mode, int64_t newposition, int64_t oldposition,
+               int edit_labels, int edit_autos, int edit_plugins, Edits *trim_edits);
+       int shift_end(int edit_mode, int64_t newposition, int64_t oldposition,
+               int edit_labels, int edit_autos, int edit_plugins, Edits *trim_edits);
+       int follow_edits(int64_t start, int64_t end, int64_t cut_length,
+               int edits_moved, int rest_moved, int edit_labels, int edit_autos,
+               int edit_plugins, Edits *trim_edits);
 
        void insert_transition(char  *title);
        void detach_transition();
@@ -128,8 +104,8 @@ public:
        int64_t length;
 // Channel or layer of source
        int channel;
-// ID for resource pixmaps
-       int id;
+// ID for resource pixmaps, plugins
+       int id, orig_id;
 // ID for selection groups
        int group_id;
 // User defined title for timeline
@@ -144,7 +120,6 @@ public:
        Transition *transition;
 
        Edits *edits;
-
        Track *track;
 
 // points to an object in edl->assets if set