X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.h;h=e59556640eda8d440927af15e4af87d66f95df88;hb=af9d4868955bf1c521383795e55d29a2d4d05db2;hp=3b1d22538726dad9422534d3fcc430cd33b8f194;hpb=b5c58822be78c8820692c916e296a2230bb2b9e2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index 3b1d2253..e5955664 100644
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -50,6 +50,7 @@
 #include "theme.inc"
 #include "tracks.inc"
 #include "vedit.inc"
+#include "zwindow.h"
 
 // Loading and saving are built on load and copy except for automation:
 
@@ -94,7 +95,9 @@ public:
 		int direction,
 		PlayableTracks *playable_tracks);
 
-// Convert position to frames if cursor alignment is enabled
+// Convert position to frame boundry times
+	double frame_align(double position, int round);
+// frame align if cursor alignment is enabled
 	double align_to_frame(double position, int round);
 
 // increase track w/h to at least session w/h
@@ -110,6 +113,7 @@ public:
 	int copy_all(EDL *edl);
 	void copy_assets(EDL *edl);
 	void copy_clips(EDL *edl);
+	void copy_mixers(EDL *edl);
 // Copy pan and fade settings from edl
 	void synchronize_params(EDL *edl);
 // Determine if the positions are equivalent if they're within half a frame
@@ -127,6 +131,7 @@ public:
 // Set points and labels
 	void set_inpoint(double position);
 	void set_outpoint(double position);
+	void unset_inoutpoint();
 // Redraw resources during index builds
 	void set_index_file(Indexable *indexable);
 // Add assets from the src to the destination
@@ -184,11 +189,13 @@ public:
 		int edit_autos);
 	void remove_from_project(ArrayList<Indexable*> *assets);
 	void remove_from_project(ArrayList<EDL*> *clips);
+	int blade(double position);
 	int clear(double start,
 		double end,
 		int clear_labels,
 		int clear_plugins,
 		int edit_autos);
+	void deglitch(double position);
 // Insert the asset at a point in the EDL
 	void insert_asset(Asset *asset,
 		EDL *nested_edl,
@@ -244,6 +251,7 @@ public:
 	ArrayList<EDL*> vwindow_edls;
 // is the vwindow_edl shared and therefore should not be deleted in destructor
 //	int vwindow_edl_shared;
+	Mixers mixers;
 
 // Media files
 // Shared between all EDLs