X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.C;h=d919c55604d216e87573ce34d1e4cbcb822e57b1;hp=61256910e0f3772246184802984450b506c803fe;hb=86bd203ac1fc29d93f63d13e2979468f06bdc3a2;hpb=6616b3b82fdbc586f5da00bf772e45d8ada3b464

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index 61256910..d919c556 100644
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -42,8 +42,6 @@ MainSession::MainSession(MWindow *mwindow)
 	track_highlighted = 0;
 	plugin_highlighted = 0;
 	pluginset_highlighted = 0;
-	vcanvas_highlighted = 0;
-	ccanvas_highlighted = 0;
 	edit_highlighted = 0;
 	current_operation = NO_OPERATION;
 	drag_pluginservers = new ArrayList<PluginServer*>;
@@ -51,6 +49,7 @@ MainSession::MainSession(MWindow *mwindow)
 	drag_assets = new ArrayList<Indexable*>;
 	drag_auto_gang = new ArrayList<Auto*>;
 	drag_clips = new ArrayList<EDL*>;
+	drag_proxy = new ArrayList<EDL*>;
 	drag_edits = new ArrayList<Edit*>;
 	drag_edit = 0;
 	clip_number = 1;
@@ -62,6 +61,8 @@ MainSession::MainSession(MWindow *mwindow)
 	cwindow_fullscreen = 0;
 	rwindow_fullscreen = 0;
 	vwindow_fullscreen = 0;
+	zwindow_fullscreen = 0;
+	selected_zwindow = -1;
 	actual_frame_rate = 0;
 	window_config = 0;
 	a_x11_host[0] = 0;
@@ -113,10 +114,12 @@ MainSession::MainSession(MWindow *mwindow)
 
 MainSession::~MainSession()
 {
+	clear_drag_proxy();
 	delete drag_pluginservers;
 	delete drag_assets;
 	delete drag_auto_gang;
 	delete drag_clips;
+	delete drag_proxy;
 	delete drag_edits;
 }
 
@@ -141,6 +144,13 @@ void MainSession::boundaries()
 	CLAMP(cwindow_controls, 0, 1);
 }
 
+void MainSession::clear_drag_proxy()
+{
+	for( int i=drag_proxy->size(); --i>=0; )
+		drag_proxy->get(i)->remove_user();
+	drag_proxy->remove_all();
+}
+
 void MainSession::save_x11_host(int play_config, const char *x11_host)
 {
 	strcpy(!play_config ? a_x11_host : b_x11_host, x11_host);
@@ -387,7 +397,7 @@ int MainSession::load_defaults(BC_Hash *defaults)
 //printf("MainSession::load_defaults 1\n");
 
 // Other windows
-	afolders_w = defaults->get("ABINS_W", 140);
+	afolders_w = defaults->get("ABINS_W", 200);
 	rwindow_x = defaults->get("RWINDOW_X", rwindow_x);
 	rwindow_y = defaults->get("RWINDOW_Y", rwindow_y);
 	rwindow_w = defaults->get("RWINDOW_W", rwindow_w);