shuttle keydef tweak, add copy_flags to copy edl, zoombar layout tweak

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

diff --git a/cinelerra-5.1/cinelerra/track.h b/cinelerra-5.1/cinelerra/track.h
index c879c40e57e43f99f903b40dd3b75d08894d8630..669b2db769cb9136b6df9cf62aa364c1d84de160 100644 (file)
--- a/cinelerra-5.1/cinelerra/track.h
+++ b/cinelerra-5.1/cinelerra/track.h
@@ -155,7 +155,7 @@ public:
 
        virtual int copy_settings(Track *track);
        void shift_keyframes(int64_t position, int64_t length);
-       void shift_effects(int64_t position, int64_t length, int edit_autos);
+       void shift_effects(int64_t position, int64_t length, int edit_autos, Edits *trim_edits);
        void change_plugins(SharedLocation &old_location, SharedLocation &new_location, int do_swap);
        void change_modules(int old_location, int new_location, int do_swap);
        int plugin_exists(Plugin *plugin);
@@ -193,11 +193,9 @@ public:
        virtual int dump(FILE *fp);
 
 // ===================================== editing
-       int copy(double start, double end,
+       int copy(int copy_flags, double start, double end,
                FileXML *file, const char *output_path = "");
-       int copy_assets(double start,
-               double end,
-               ArrayList<Asset*> *asset_list);
+       int copy_assets(double start, double end, ArrayList<Asset*> *asset_list);
        virtual int copy_derived(int64_t start, int64_t end, FileXML *file) { return 0; };
        virtual int paste_derived(int64_t start, int64_t end,
                int64_t total_length, FileXML *file, int &current_channel) { return 0; };