X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrack.h;h=c2c43302f9aceb470f4b74bdb704328fe5ee3d9a;hp=c879c40e57e43f99f903b40dd3b75d08894d8630;hb=04293346a5ef49683cfa6ca3a98ef6cbfcdf7732;hpb=ab209efd7893132268c7dc159cd78a4574276946

diff --git a/cinelerra-5.1/cinelerra/track.h b/cinelerra-5.1/cinelerra/track.h
index c879c40e..c2c43302 100644
--- a/cinelerra-5.1/cinelerra/track.h
+++ b/cinelerra-5.1/cinelerra/track.h
@@ -71,6 +71,13 @@ public:
 	void equivalent_output(Track *track, double *result);
 	int get_mixer_id();
 
+	void get_fauto_xyz(int fauto, float &x, float &y, float &z);
+	void set_fauto_xyz(int fauto, float x, float y, float z);
+	void get_projector(float &x, float &y, float &z);
+	void set_projector(float x, float y, float z);
+	void get_camera(float &x, float &y, float &z);
+	void set_camera(float x, float y, float z);
+
 	virtual void copy_from(Track *track);
 	Track& operator=(Track& track);
 	virtual PluginSet* new_plugins() { return 0; };
@@ -105,7 +112,7 @@ public:
 		double edl_length);
 	void shuffle_edits(double start, double end, int first_track);
 	void reverse_edits(double start, double end, int first_track);
-	void align_edits(double start, double end, ArrayList<double> *times);
+	void align_edits(double start, double end, Track *master_track);
 // Optimize editing
 	void optimize();
 	int is_muted(int64_t position, int direction);  // Test muting status
@@ -139,7 +146,7 @@ public:
 // Called by playable tracks to test for playable server.
 // Descends the plugin tree without creating a virtual console.
 // Used by PlayableTracks::is_playable.
-	int is_synthesis(int64_t position, int direction);
+	int is_synthesis(int64_t position, int direction, int depth=0);
 
 // Used by PlayableTracks::is_playable
 // Returns 1 if the track is in the output boundaries.
@@ -155,7 +162,7 @@ public:
 
 	virtual int copy_settings(Track *track);
 	void shift_keyframes(int64_t position, int64_t length);
-	void shift_effects(int64_t position, int64_t length, int edit_autos);
+	void shift_effects(int64_t position, int64_t length, int edit_autos, Edits *trim_edits);
 	void change_plugins(SharedLocation &old_location, SharedLocation &new_location, int do_swap);
 	void change_modules(int old_location, int new_location, int do_swap);
 	int plugin_exists(Plugin *plugin);
@@ -179,6 +186,8 @@ public:
 	char title[BCTEXTLEN];
 	int play;
 	int record;
+// mask enable bit flags
+	int masks;
 // Nudge in track units.  Positive shifts track earlier in time.  This way
 // the position variables only need to add the nudge.
 	int64_t nudge;
@@ -193,11 +202,9 @@ public:
 	virtual int dump(FILE *fp);
 
 // ===================================== editing
-	int copy(double start, double end,
+	int copy(int copy_flags, double start, double end,
 		FileXML *file, const char *output_path = "");
-	int copy_assets(double start,
-		double end,
-		ArrayList<Asset*> *asset_list);
+	int copy_assets(double start, double end, ArrayList<Asset*> *asset_list);
 	virtual int copy_derived(int64_t start, int64_t end, FileXML *file) { return 0; };
 	virtual int paste_derived(int64_t start, int64_t end,
 		int64_t total_length, FileXML *file, int &current_channel) { return 0; };