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

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

diff --git a/cinelerra-5.1/cinelerra/tracks.h b/cinelerra-5.1/cinelerra/tracks.h
index 4d3bef901665b06644c0af5d94abbf33823554ef..b7cd63aca94ad8df1336e2eed6466e64cf50435b 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracks.h
+++ b/cinelerra-5.1/cinelerra/tracks.h
@@ -50,14 +50,14 @@ public:
                int &track_offset,
                uint32_t load_flags);
        void move_edits(ArrayList<Edit*> *edits, Track *track, double position,
-               int edit_labels, int edit_plugins, int edit_autos, int behaviour);
-       void move_group(EDL *group, Track *first_track, double position);
+               int edit_labels, int edit_plugins, int edit_autos, int mode);
+       void move_group(EDL *group, Track *first_track, double position, int overwrite);
        void move_effect(Plugin *plugin, Track *track, int64_t position);
        void move_effect(Plugin *plugin, PluginSet *plugin_set, int64_t position);
 
 // Construct a list of all the recordable edits which start on position
        void clear_selected_edits();
-       void select_affected_edits(double position, Track *start_track);
+       void select_affected_edits(double position, Track *start_track, int sense);
        void get_selected_edits(ArrayList<Edit*> *drag_edits);
        int next_group_id();
        int new_group(int id);
@@ -160,18 +160,10 @@ public:
        void copy_from(Tracks *tracks);
 
 // ================================== EDL editing
-       int copy(double start,
-               double end,
-               int all,
-               FileXML *file,
-               const char *output_path = "");
-
+       int copy(int copy_flags, double start, double end,
+               FileXML *file, const char *output_path = "");
 
-
-       int copy_assets(FileXML *xml,
-               double start,
-               double end,
-               int all);
+       int copy_assets(int copy_flags, FileXML *xml, double start, double end);
        int blade(double position);
        int clear(double start, double end, int clear_plugins, int edit_autos);
        void clear_automation(double selectionstart,
@@ -217,13 +209,9 @@ public:
        int popup_transition(int cursor_x, int cursor_y);
        int select_auto(int cursor_x, int cursor_y);
        int move_auto(int cursor_x, int cursor_y, int shift_down);
-       int modify_edithandles(double &oldposition,
-               double &newposition,
-               int currentend,
-               int handle_mode,
-               int edit_labels,
-               int edit_plugins,
-               int edit_autos);
+       int modify_edithandles(double &oldposition, double &newposition,
+               int currentend, int handle_mode, int edit_labels,
+               int edit_plugins, int edit_autos, int group_id);
        int modify_pluginhandles(double &oldposition,
                double &newposition,
                int currentend,