X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flocalsession.C;h=75001658c7f76d98bbf8097c3cb781ba43977bdc;hb=78220c35c918002018ea6bea42c1bd08abb393e6;hp=c8cd9041a8019711706d96e4f8418870b757e92b;hpb=a6e4ede4b9a11b56b3aece044ff2a1546630ca38;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C index c8cd9041..75001658 100644 --- a/cinelerra-5.1/cinelerra/localsession.C +++ b/cinelerra-5.1/cinelerra/localsession.C @@ -24,6 +24,7 @@ #include "clip.h" #include "bchash.h" #include "edl.h" +#include "edlsession.h" #include "filesystem.h" #include "filexml.h" #include "floatauto.h" @@ -347,9 +348,9 @@ int LocalSession::load_defaults(BC_Hash *defaults) // track_start = defaults->get("TRACK_START", 0); // view_start = defaults->get("VIEW_START", 0); zoom_sample = defaults->get("ZOOM_SAMPLE", DEFAULT_ZOOM_TIME); - zoom_y = defaults->get("ZOOMY", 64); + zoom_y = defaults->get("ZOOMY", DEFAULT_ZOOM_TRACK); int64_t zoom_track = defaults->get("ZOOM_TRACK", 0); - if( zoom_track == 0 ) zoom_track = 64; + if( zoom_track == 0 ) zoom_track = DEFAULT_ZOOM_TRACK; zoom_atrack = defaults->get("ZOOM_ATRACK", zoom_track); zoom_vtrack = defaults->get("ZOOM_VTRACK", zoom_track); red = defaults->get("RED", 0.0); @@ -511,9 +512,12 @@ void LocalSession::reset_view_limits() { automation_mins[AUTOGROUPTYPE_ZOOM] = 0.005; automation_maxs[AUTOGROUPTYPE_ZOOM] = 5.000; - automation_mins[AUTOGROUPTYPE_X] = -100; - automation_maxs[AUTOGROUPTYPE_X] = 100; - automation_mins[AUTOGROUPTYPE_Y] = -100; - automation_maxs[AUTOGROUPTYPE_Y] = 100; + int out_w = edl->session->output_w; + automation_mins[AUTOGROUPTYPE_X] = -out_w; + automation_maxs[AUTOGROUPTYPE_X] = out_w; + int out_h = edl->session->output_h; + automation_mins[AUTOGROUPTYPE_Y] = -out_h; + automation_maxs[AUTOGROUPTYPE_Y] = out_h; + }