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

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

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index 6ec34c8ff51a513023adba55ae6b9fd8eb78a30f..f355b57ab21b29fdd24acb1b3bbe4fa53738954b 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -107,21 +107,29 @@ public:
        void rechannel();
        void resample(double old_rate, double new_rate, int data_type);
 
-       int copy(double start, double end, int all,
+       int copy(int copy_flags, double start, double end,
                FileXML *file, const char *output_path, int rewind_it);
-       int copy(int all, FileXML *file, const char *output_path, int rewind_it);
+       int copy(int copy_flags, FileXML *file, const char *output_path,
+               int rewind_it);
 
-       int copy_clip(double start, double end, int all,
+       int copy_clip(int copy_flags, double start, double end,
                FileXML *file, const char *output_path, int rewind_it);
-       int copy_clip(int all, FileXML *file, const char *output_path, int rewind_it);
+       int copy_clip(int copy_flags, FileXML *file, const char *output_path,
+               int rewind_it);
 
-       int copy_nested_edl(double start, double end, int all,
+       int copy_nested(int copy_flags, double start, double end,
                FileXML *file, const char *output_path, int rewind_it);
-       int copy_nested_edl(int all, FileXML *file, const char *output_path, int rewind_it);
+       int copy_nested(int copy_flags, FileXML *file, const char *output_path,
+               int rewind_it);
 
-       int copy_vwindow_edl(double start, double end, int all,
+       int copy_vwindow(int copy_flags, double start, double end,
                FileXML *file, const char *output_path, int rewind_it);
-       int copy_vwindow_edl(int all, FileXML *file, const char *output_path, int rewind_it);
+       int copy_vwindow(int copy_flags, FileXML *file, const char *output_path,
+               int rewind_it);
+
+       int copy_xml(int copy_flags, double start, double end,
+               FileXML *file, const char *closer, const char *output_path,
+               int rewind_it);
 
        void copy_tracks(EDL *edl);
 // Copies project path, folders, EDLSession, and LocalSession from edl argument.
@@ -172,34 +180,20 @@ public:
        void delete_edit_labels(ArrayList<Edit*> *edits, int collapse);
        void move_edit_labels(ArrayList<Edit*> *edits, double dist);
 
-       void modify_edithandles(double oldposition,
-               double newposition,
-               int currentend,
-               int handle_mode,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos);
+       void modify_edithandles(double oldposition, double newposition,
+               int currentend, int handle_mode, int edit_labels,
+               int edit_plugins, int edit_autos, int group_id);
 
-       void modify_pluginhandles(double oldposition,
-               double newposition,
-               int currentend,
-               int handle_mode,
-               int edit_labels,
-               int edit_autos,
-               Edits *trim_edits);
-
-       int trim_selection(double start,
-               double end,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos);
+       void modify_pluginhandles(double oldposition, double newposition,
+               int currentend, int handle_mode, int edit_labels,
+               int edit_autos, Edits *trim_edits);
+
+       int trim_selection(double start, double end,
+               int edit_labels, int edit_plugins, int edit_autos);
 
 // Editing functions
-       int copy_assets(double start, double end,
-               FileXML *file, int all, const char *output_path);
-       int copy(double start, double end, int all,
-               const char *closer, FileXML *file,
-               const char *output_path, int rewind_it);
+       int copy_assets(int copy_flags, double start, double end,
+               FileXML *file, const char *output_path);
        void copy_indexables(EDL *edl);
        EDL *new_nested(EDL *edl, const char *path);
        EDL *create_nested_clip(EDL *nested);