transportque tweaks for shuttle, fixes videoscope/undo hangs

[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 5e184d22965f18bdd76545a315a5c4806971f8e0..22c9332c6c067ef02a98ab95561c4cfa6f55a14e 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -97,8 +97,9 @@ public:
        double frame_align(double position, int round);
 // frame align if cursor alignment is enabled
        double align_to_frame(double position, int round);
-// get position under cursor in pane
+// get position under cursor in pane, and inverse
        double get_cursor_position(int cursor_x, int pane_no);
+       int64_t get_position_cursorx(double position, int pane_no);
 
 // increase track w/h to at least session w/h
        void retrack();
@@ -167,28 +168,20 @@ public:
        const char *get_folder_name(int no);
        int new_folder(const char *title, int is_clips);
        int delete_folder(const char *title);
+       void delete_edits(ArrayList<Edit*>*, int);
+       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,
@@ -223,6 +216,8 @@ public:
        int insert_clips(ArrayList<EDL*> *new_edls, int load_mode, Track *first_track = 0);
 // Add a copy of EDL* to the clip array.  Returns the copy.
        EDL* add_clip(EDL *edl);
+// resequence group ids starting at next_id
+       int regroup(int next_id);
 
        void get_shared_plugins(Track *source, ArrayList<SharedLocation*> *plugin_locations,
                int omit_recordable, int data_type);