X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.h;h=cc7c7fab51ba7706df04ae7364f67f7d952bcea8;hp=e377c3361fb1aa895fb2679b8d0d3f4599bf181c;hb=abf5c6bb4dec2c2d03df2872e1d337e3905b3619;hpb=ee1879b1a1850e1d4e19c034d4a9c5459274bbb6

diff --git a/cinelerra-5.1/cinelerra/edit.h b/cinelerra-5.1/cinelerra/edit.h
index e377c336..cc7c7fab 100644
--- 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,18 +107,20 @@ 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;
 // edge cannot be optimized
 	int hard_left, hard_right;
-
+// title bar color
+	int color;
 // Transition if one is present at the beginning of this edit
 // This stores the length of the transition
 	Transition *transition;
 
 	Edits *edits;
-
 	Track *track;
 
 // points to an object in edl->assets if set