X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.h;h=fd58d210dad1291a4adf3a4f2378eb138dfafdef;hb=09ccfde5a1fd65069f69b37490462b7ccf38a336;hp=e68938d997711a9d310b55a300cda688bf485da8;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainsession.h b/cinelerra-5.1/cinelerra/mainsession.h
index e68938d9..fd58d210 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 "vwindowgui.inc"
 
 // Options not in EDL but not changed in preferences
 class MainSession
@@ -48,15 +49,12 @@ public:
 
 	int load_defaults(BC_Hash *defaults);
 	int save_defaults(BC_Hash *defaults);
+	void clear_drag_proxy();
 	void save_x11_host(int play_config, const char *x11_host);
 	int set_default_x11_host(int win_config=-1);
 	void default_window_positions(int window_config=0);
 	void boundaries();
 
-
-
-
-
 // For drag and drop events
 // The entire track where the dropped asset is going to go
 	Track *track_highlighted;
@@ -66,10 +64,6 @@ public:
 	PluginSet *pluginset_highlighted;
 // The plugin after the point where the plugin is going to be dropped.
 	Plugin *plugin_highlighted;
-// Viewer canvas highlighted
-	int vcanvas_highlighted;
-// Compositor canvas highlighted
-	int ccanvas_highlighted;
 // Current drag operation
 	int current_operation;
 
@@ -80,6 +74,7 @@ public:
 	Edits *trim_edits;
 	ArrayList<Indexable*> *drag_assets;
 	ArrayList<EDL*> *drag_clips;
+	ArrayList<EDL*> *drag_proxy;
 	Auto *drag_auto;
 	ArrayList<Auto*> *drag_auto_gang;
 
@@ -100,7 +95,7 @@ public:
 // Value of keyframe when button was pressed
 	float drag_start_percentage;
 	long drag_start_position;
-// Records for redrawing brender position in timebar
+// Amount of data rendered, for drawing status in timebar
 	double brender_end;
 // Position of cursor in CWindow output.  Used by ruler.
 	int cwindow_output_x, cwindow_output_y;
@@ -142,6 +137,8 @@ public:
 	int cswindow_x, cswindow_y, cswindow_w, cswindow_h;
 // subtitle
 	int swindow_x, swindow_y, swindow_w, swindow_h;
+// binfolder filter window
+	int bwindow_w, bwindow_h;
 // error window
 	int ewindow_w, ewindow_h;
 // Channel edit window
@@ -161,7 +158,6 @@ public:
 	int use_hist_parade;
 	int use_wave_parade;
 
-
 	int afolders_w;
 	int show_vwindow, show_awindow, show_cwindow, show_gwindow, show_lwindow;
 	int plugindialog_w, plugindialog_h;
@@ -176,7 +172,8 @@ public:
 	int cwindow_fullscreen;
 	int rwindow_fullscreen;
 	int vwindow_fullscreen;
-
+	int zwindow_fullscreen;
+	int selected_zwindow;
 
 	double actual_frame_rate;