X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.C;h=f4e4cc9b8e29cbabcc5da923abea54cfbe2145b3;hp=de63b8b112b03ac399d6484499a6460d6d15e1c0;hb=refs%2Fheads%2Fmaster;hpb=1acde49894b2d6d27f599898ae0ee24e6cfcc25c

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index de63b8b1..f4e4cc9b 100644
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -36,6 +36,7 @@
 #include "mwindow.h"
 #include "mwindowgui.h"
 #include "plugin.h"
+#include "transition.h"
 
 MainSession::MainSession(MWindow *mwindow)
 {
@@ -51,6 +52,7 @@ MainSession::MainSession(MWindow *mwindow)
 	current_operation = NO_OPERATION;
 	drag_pluginservers = new ArrayList<PluginServer*>;
 	drag_plugin = 0;
+	drag_transition = 0;
 	drag_assets = new ArrayList<Indexable*>;
 	drag_auto_gang = new ArrayList<Auto*>;
 	drag_clips = new ArrayList<EDL*>;
@@ -96,6 +98,7 @@ MainSession::MainSession(MWindow *mwindow)
 	gwindow_x = gwindow_y = 0;
 	cswindow_x = cswindow_y = cswindow_w = cswindow_h = 0;
 	swindow_x = swindow_y = swindow_w = swindow_h = 0;
+	tile_mixers_x = tile_mixers_y = tile_mixers_w = tile_mixers_h = 0;
 	ewindow_w = ewindow_h = 0;
 	channels_x = channels_y = 0;
 	picture_x = picture_y = 0;
@@ -376,6 +379,11 @@ void MainSession::default_window_positions(int window_config)
 	swindow_w = xS(600);
 	swindow_h = yS(400);
 
+	tile_mixers_x = 1 + mwindow_x;
+	tile_mixers_y = 1;
+	tile_mixers_w = cwindow_x - tile_mixers_x;
+	tile_mixers_h = mwindow_y - tile_mixers_y;
+
 	batchrender_w = xS(750);
 	batchrender_h = yS(400);
 	batchrender_x = root_w / 2 - batchrender_w / 2;
@@ -483,6 +491,11 @@ int MainSession::load_defaults(BC_Hash *defaults)
 	rmonitor_w = defaults->get("RMONITOR_W", rmonitor_w);
 	rmonitor_h = defaults->get("RMONITOR_H", rmonitor_h);
 
+	tile_mixers_x = defaults->get("TILE_MIXERS_X", 0);
+	tile_mixers_y = defaults->get("TILE_MIXERS_Y", 0);
+	tile_mixers_w = defaults->get("TILE_MIXERS_W", 0);
+	tile_mixers_h = defaults->get("TILE_MIXERS_H", 0);
+
 	batchrender_x = defaults->get("BATCHRENDER_X", batchrender_x);
 	batchrender_y = defaults->get("BATCHRENDER_Y", batchrender_y);
 	batchrender_w = defaults->get("BATCHRENDER_W", batchrender_w);
@@ -593,6 +606,11 @@ int MainSession::save_defaults(BC_Hash *defaults)
 	defaults->update("RMONITOR_W", rmonitor_w);
 	defaults->update("RMONITOR_H", rmonitor_h);
 
+	defaults->update("TILE_MIXERS_X", tile_mixers_x);
+	defaults->update("TILE_MIXERS_Y", tile_mixers_y);
+	defaults->update("TILE_MIXERS_W", tile_mixers_w);
+	defaults->update("TILE_MIXERS_H", tile_mixers_h);
+
 	defaults->update("RWINDOW_X", rwindow_x);
 	defaults->update("RWINDOW_Y", rwindow_y);
 	defaults->update("RWINDOW_W", rwindow_w);
@@ -657,6 +675,10 @@ Track *MainSession::drag_handle_track()
 	case DRAG_PLUGINHANDLE2:
 		track = drag_plugin->edits->track;
 		break;
+	case DRAG_TRANSNHANDLE1:
+	case DRAG_TRANSNHANDLE2:
+		track = drag_transition->edits->track;
+		break;
 	}
 	return track;
 }