projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mainsession.C
diff --git
a/cinelerra-5.1/cinelerra/mainsession.C
b/cinelerra-5.1/cinelerra/mainsession.C
index 7d582c46d59e65d7b32e2a0993067a69664834af..f4e4cc9b8e29cbabcc5da923abea54cfbe2145b3 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainsession.C
+++ b/
cinelerra-5.1/cinelerra/mainsession.C
@@
-98,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;
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;
ewindow_w = ewindow_h = 0;
channels_x = channels_y = 0;
picture_x = picture_y = 0;
@@
-378,6
+379,11
@@
void MainSession::default_window_positions(int window_config)
swindow_w = xS(600);
swindow_h = yS(400);
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;
batchrender_w = xS(750);
batchrender_h = yS(400);
batchrender_x = root_w / 2 - batchrender_w / 2;
@@
-485,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);
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);
batchrender_x = defaults->get("BATCHRENDER_X", batchrender_x);
batchrender_y = defaults->get("BATCHRENDER_Y", batchrender_y);
batchrender_w = defaults->get("BATCHRENDER_W", batchrender_w);
@@
-595,6
+606,11
@@
int MainSession::save_defaults(BC_Hash *defaults)
defaults->update("RMONITOR_W", rmonitor_w);
defaults->update("RMONITOR_H", rmonitor_h);
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);
defaults->update("RWINDOW_X", rwindow_x);
defaults->update("RWINDOW_Y", rwindow_y);
defaults->update("RWINDOW_W", rwindow_w);