X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.h;h=e8d31db67e4e07f2b6c569e91fe7adb83fd1bf2c;hb=232ae3c6972c1740b6e1890ccce1264f2bb311f5;hp=06bd12c09b770b6f73ab08650625a9cc7e7eda73;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainsession.h b/cinelerra-5.1/cinelerra/mainsession.h
index 06bd12c0..e8d31db6 100644
--- a/cinelerra-5.1/cinelerra/mainsession.h
+++ b/cinelerra-5.1/cinelerra/mainsession.h
@@ -38,6 +38,7 @@
 #include "pluginset.inc"
 #include "pluginserver.inc"
 #include "track.inc"
+#include "transition.inc"
 #include "vwindowgui.inc"
 
 // Options not in EDL but not changed in preferences
@@ -55,6 +56,8 @@ public:
 	void boundaries();
 	Track *drag_handle_track();
 	void update_clip_number();
+	int load_file(const char *path);
+	int save_file(const char *path);
 
 // For drag and drop events
 // The entire track where the dropped asset is going to go
@@ -71,6 +74,7 @@ public:
 // Item being dragged
 	ArrayList <PluginServer*> *drag_pluginservers;
 	Plugin *drag_plugin;
+	Transition *drag_transition;
 // When trim should only affect the selected edits or plugins
 	Edits *trim_edits;
 	ArrayList<Indexable*> *drag_assets;
@@ -80,6 +84,14 @@ public:
 
 // Edit whose handle is being dragged
 	Edit *drag_edit;
+// Selected edits clip of grouped drag
+	EDL *drag_group;
+// drag edit of selected edits
+	Edit *drag_group_edit;
+// cursor position in selected edits at start of drag
+	double drag_group_position;
+// top track of selected edits
+	Track *drag_group_first_track;
 // Edits who are being dragged
 	ArrayList<Edit*> *drag_edits;
 // Button pressed during drag
@@ -105,6 +117,8 @@ public:
 
 // Clip number for automatic title generation
 	int clip_number;
+// Next group id index
+	int group_number;
 
 // Audio session
 	int changes_made;
@@ -112,6 +126,9 @@ public:
 // filename of the current project for window titling and saving
 	char filename[BCTEXTLEN];
 
+// title bar background blend
+	float title_bar_alpha;
+
 	int batchrender_x, batchrender_y, batchrender_w, batchrender_h;
 
 // Window positions
@@ -157,6 +174,12 @@ public:
 	int use_vector;
 	int use_hist_parade;
 	int use_wave_parade;
+	int use_wave_gain;
+	int use_vect_gain;
+	int use_smooth;
+	int use_refresh;
+	int use_release;
+	int use_graticule;
 
 	int afolders_w;
 	int show_vwindow, show_awindow, show_cwindow, show_gwindow, show_lwindow;
@@ -169,10 +192,6 @@ public:
 	int menueffect_w, menueffect_h;
 	int transitiondialog_w, transitiondialog_h;
 
-	int cwindow_fullscreen;
-	int rwindow_fullscreen;
-	int vwindow_fullscreen;
-	int zwindow_fullscreen;
 	int selected_zwindow;
 
 	double actual_frame_rate;