X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ftracks.h;h=0aff6a37365930a5865cb54ac9463b0876a65490;hb=9668279ccef86a9cc9138aaa1a659f158698f829;hp=0cc248d060abcec0cdbd4751d63c50f97e194159;hpb=9a7a880b549aed850fd3c29abb152d69a94e23f8;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/tracks.h b/cinelerra-5.1/cinelerra/tracks.h
index 0cc248d0..0aff6a37 100644
--- a/cinelerra-5.1/cinelerra/tracks.h
+++ b/cinelerra-5.1/cinelerra/tracks.h
@@ -50,7 +50,7 @@ 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);
+		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);
@@ -58,6 +58,7 @@ public:
 // 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, int sense);
+	int clear_hard_edges(double start, double end);
 	void get_selected_edits(ArrayList<Edit*> *drag_edits);
 	int next_group_id();
 	int new_group(int id);
@@ -103,7 +104,8 @@ public:
 	void select_all(int type,
 		int value);
 	void translate_projector(float offset_x, float offset_y);
-		int total_of(int type);
+	int total_of(int type);
+	Track* get_track_by_id(int id);
 // add a track
 	Track* add_audio_track(int above, Track *dst_track);
 	Track* add_video_track(int above, Track *dst_track);
@@ -160,18 +162,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 +211,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,