X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=ddce17f1b45dbd9c18a1b09ee0edcf928d6d58b5;hp=0930dd0593b185b5c2f1b4136dd22dd03a2d83d5;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hpb=49f85559268fc040fe7ba5611cc0520793cf728b

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 0930dd05..ddce17f1 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -53,7 +53,7 @@ EDLSession::EDLSession(EDL *edl)
 	audio_tracks = 2;
 	autos_follow_edits = 1; // this is needed for predictability
 	auto_keyframes = 0;
-	brender_start = 0.0;
+	brender_start = brender_end = 0.0;
 	clipboard_length = 0; // unused
 	color_model = BC_RGBA8888;
 	interlace_mode = ILACE_MODE_UNDETECTED;
@@ -225,6 +225,7 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	auto_conf->load_defaults(defaults);
 	autos_follow_edits = defaults->get("AUTOS_FOLLOW_EDITS", 1);
 	brender_start = defaults->get("BRENDER_START", brender_start);
+	brender_end = defaults->get("BRENDER_END", brender_end);
 	BC_CModels::to_text(string, BC_RGBA8888);
 	color_model = BC_CModels::from_text(defaults->get("COLOR_MODEL", string));
 	eyedrop_radius = defaults->get("EYEDROP_RADIUS", 0);
@@ -372,6 +373,7 @@ int EDLSession::save_defaults(BC_Hash *defaults)
 	defaults->update("ATRACKS", audio_tracks);
 	defaults->update("AUTOS_FOLLOW_EDITS", autos_follow_edits);
 	defaults->update("BRENDER_START", brender_start);
+	defaults->update("BRENDER_END", brender_end);
 	BC_CModels::to_text(string, color_model);
 	defaults->update("COLOR_MODEL", string);
 	ilacemode_to_xmltext(string, interlace_mode);
@@ -516,6 +518,7 @@ void EDLSession::boundaries()
 	Workarounds::clamp(ruler_y1, 0.0, output_h);
 	Workarounds::clamp(ruler_y2, 0.0, output_h);
 	if(brender_start < 0) brender_start = 0.0;
+	if(brender_end < 0) brender_end = 0.0;
 
 	Workarounds::clamp(subtitle_number, 0, 31);
 	Workarounds::clamp(awindow_folder, 0, AWINDOW_FOLDERS - 1);
@@ -595,6 +598,7 @@ int EDLSession::load_xml(FileXML *file,
 		auto_keyframes = file->tag.get_property("AUTO_KEYFRAMES", auto_keyframes);
 		autos_follow_edits = file->tag.get_property("AUTOS_FOLLOW_EDITS", autos_follow_edits);
 		brender_start = file->tag.get_property("BRENDER_START", brender_start);
+		brender_end = file->tag.get_property("BRENDER_END", brender_end);
 		eyedrop_radius = file->tag.get_property("EYEDROP_RADIUS", eyedrop_radius);
 		crop_x1 = file->tag.get_property("CROP_X1", crop_x1);
 		crop_y1 = file->tag.get_property("CROP_Y1", crop_y1);
@@ -668,6 +672,7 @@ int EDLSession::save_xml(FileXML *file)
 	file->tag.set_property("AUTO_KEYFRAMES", auto_keyframes);
 	file->tag.set_property("AUTOS_FOLLOW_EDITS", autos_follow_edits);
 	file->tag.set_property("BRENDER_START", brender_start);
+	file->tag.set_property("BRENDER_END", brender_end);
 	file->tag.set_property("EYEDROP_RADIUS", eyedrop_radius);
 	file->tag.set_property("CROP_X1", crop_x1);
 	file->tag.set_property("CROP_Y1", crop_y1);
@@ -797,6 +802,7 @@ int EDLSession::copy(EDLSession *session)
 	audio_tracks = session->audio_tracks;
 	autos_follow_edits = session->autos_follow_edits;
 	brender_start = session->brender_start;
+	brender_end = session->brender_end;
 	color_model = session->color_model;
 	interlace_mode = session->interlace_mode;
 	eyedrop_radius = session->eyedrop_radius;