mask mousewheel segv bug, mask opengl sw fallback read to ram, fix tiff config withou...

[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 a23f92e1019dc73034e104b44a530b5c0f87cdec..cc7c7fab51ba7706df04ae7364f67f7d952bcea8 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.h
+++ b/cinelerra-5.1/cinelerra/edit.h
@@ -77,43 +77,21 @@ 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();
 // Determine if silence depending on existance of asset or plugin title
        virtual int silence();
+       void set_selected(int v);
 
 // Media edit information
 // Units are native units for the track.
@@ -129,6 +107,8 @@ public:
        int channel;
 // ID for resource pixmaps
        int id;
+// ID for selection groups
+       int group_id;
 // User defined title for timeline
        char user_title[BCTEXTLEN];
        int is_plugin, is_selected;
@@ -141,7 +121,6 @@ public:
        Transition *transition;
 
        Edits *edits;
-
        Track *track;
 
 // points to an object in edl->assets if set
@@ -169,10 +148,6 @@ public:
                float zoom_units) { return 0; }
        virtual int64_t get_source_end(int64_t default_);
        void get_title(char *title);
-// edit title bar color
-       int get_title_color();
-// default edit title bar color
-       int get_hash_color();
 
        int dump(FILE *fp=stdout);
        virtual int dump_derived() { return 0; }