X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=f0815d5ab22110bd0afcdd4271d5b90a20ae90e5;hb=0b78779e9e75131eee81d2e4689b98df0e91c092;hp=50ba297e4ac697875b22971235405bf440bde932;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 50ba297e..f0815d5a 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -24,6 +24,7 @@
 #include "autoconf.h"
 #include "bccmodels.h"
 #include "bchash.h"
+#include "clip.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "filexml.h"
@@ -172,7 +173,7 @@ void EDLSession::equivalent_output(EDLSession *session, double *result)
 {
 	if(session->output_w != output_w ||
 		session->output_h != output_h ||
-		session->frame_rate != frame_rate ||
+		!EQUIV(session->frame_rate, frame_rate) ||
 		session->color_model != color_model ||
 		session->interpolation_type != interpolation_type ||
 		session->interpolate_raw != interpolate_raw ||
@@ -249,9 +250,9 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	cwindow_xscroll = defaults->get("CWINDOW_XSCROLL", 0);
 	cwindow_yscroll = defaults->get("CWINDOW_YSCROLL", 0);
 	cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1);
-	sprintf(default_atransition, "Crossfade");
+	sprintf(default_atransition, _("Crossfade"));
 	defaults->get("DEFAULT_ATRANSITION", default_atransition);
-	sprintf(default_vtransition, "Dissolve");
+	sprintf(default_vtransition, _("Dissolve"));
 	defaults->get("DEFAULT_VTRANSITION", default_vtransition);
 	default_transition_length = defaults->get("DEFAULT_TRANSITION_LENGTH", (double)1);
 	edit_handle_mode[0] = defaults->get("EDIT_HANDLE_MODE0", MOVE_ALL_EDITS);
@@ -335,14 +336,13 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	video_write_length = defaults->get("VIDEO_WRITE_LENGTH", 30);
 	view_follows_playback = defaults->get("VIEW_FOLLOWS_PLAYBACK", 1);
 	vwindow_meter = defaults->get("VWINDOW_METER", 0);
-
+	vwindow_zoom = defaults->get("VWINDOW_ZOOM", (float)1);
 
 	decode_subtitles = defaults->get("DECODE_SUBTITLES", decode_subtitles);
 	subtitle_number = defaults->get("SUBTITLE_NUMBER", subtitle_number);
 	label_cells = defaults->get("LABEL_CELLS", label_cells);
 	program_no = defaults->get("PROGRAM_NO", program_no);
 
-	vwindow_zoom = defaults->get("VWINDOW_ZOOM", (float)1);
 	boundaries();
 
 	return 0;
@@ -640,6 +640,7 @@ int EDLSession::load_xml(FileXML *file,
 		subtitle_number = file->tag.get_property("SUBTITLE_NUMBER", subtitle_number);
 		label_cells = file->tag.get_property("LABEL_CELLS", label_cells);
 		program_no = file->tag.get_property("PROGRAM_NO", program_no);
+
 		boundaries();
 	}