X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=9bdb6458192f00ed7811f44f43ef9db688fc8d45;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=e0d5f7016b733dd2c705656ce1f3ad7b28d4ab6c;hpb=62ba04ea5b57d760bb66b65d533598cde044b685;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index e0d5f701..9bdb6458 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -99,6 +99,7 @@ EDLSession::EDLSession(EDL *edl)
 	playback_cursor_visible = 0;
 	playback_preload = 0;
 	proxy_scale = 1;
+	proxy_disabled_scale = 1;
 	proxy_use_scaler = 0;
 	proxy_auto_scale = 1;
 	proxy_beep = 0;
@@ -174,6 +175,7 @@ int EDLSession::need_rerender(EDLSession *ptr)
 		(subtitle_number != ptr->subtitle_number) ||
 		(interpolate_raw != ptr->interpolate_raw) ||
 		(white_balance_raw != ptr->white_balance_raw) ||
+		(proxy_disabled_scale != ptr->proxy_disabled_scale) ||
 		(proxy_scale != ptr->proxy_scale) ||
 	    	(proxy_use_scaler != ptr->proxy_use_scaler));
 }
@@ -189,6 +191,7 @@ void EDLSession::equivalent_output(EDLSession *session, double *result)
 	    session->white_balance_raw != white_balance_raw ||
 	    session->decode_subtitles != decode_subtitles ||
 	    session->subtitle_number != subtitle_number ||
+	    session->proxy_disabled_scale != proxy_disabled_scale ||
 	    session->proxy_scale != proxy_scale ||
 	    session->proxy_use_scaler != proxy_use_scaler )
 		*result = 0;
@@ -553,6 +556,7 @@ int EDLSession::load_video_config(FileXML *file, int append_mode, uint32_t load_
 	aspect_w = file->tag.get_property("ASPECTW", aspect_w);
 	aspect_h = file->tag.get_property("ASPECTH", aspect_h);
 	proxy_scale = file->tag.get_property("PROXY_SCALE", proxy_scale);
+	proxy_disabled_scale = file->tag.get_property("PROXY_DISABLED_SCALE", proxy_disabled_scale);
 	proxy_use_scaler = file->tag.get_property("PROXY_USE_SCALER", proxy_use_scaler);
 	proxy_auto_scale = file->tag.get_property("PROXY_AUTO_SCALE", proxy_auto_scale);
 	return 0;
@@ -748,6 +752,7 @@ int EDLSession::save_video_config(FileXML *file)
 	file->tag.set_property("ASPECTW", aspect_w);
 	file->tag.set_property("ASPECTH", aspect_h);
 	file->tag.set_property("PROXY_SCALE", proxy_scale);
+	file->tag.set_property("PROXY_DISABLED_SCALE", proxy_disabled_scale);
 	file->tag.set_property("PROXY_USE_SCALER", proxy_use_scaler);
 	file->tag.set_property("PROXY_AUTO_SCALE", proxy_auto_scale);
 	file->append_tag();
@@ -890,6 +895,7 @@ int EDLSession::copy(EDLSession *session)
 	vwindow_zoom = session->vwindow_zoom;
 	vwindow_click2play = session->vwindow_click2play;
 	proxy_scale = session->proxy_scale;
+	proxy_disabled_scale = session->proxy_disabled_scale;
 	proxy_use_scaler = session->proxy_use_scaler;
 	proxy_auto_scale = session->proxy_auto_scale;
 	proxy_beep = session->proxy_beep;
@@ -909,12 +915,12 @@ void EDLSession::dump()
 	printf("    audio_tracks=%d audio_channels=%d sample_rate=%jd\n"
 		"    video_tracks=%d frame_rate=%f output_w=%d output_h=%d aspect_w=%f aspect_h=%f\n"
 		"    decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n"
-		"    proxy_scale=%d\n proxy_use_scaler=%d, proxy_auto_scale=%d\n"
-		" proxy_beep=%d render_beep=%d\n",
+		"    proxy scale=%d\n disabled_scale=%d, use_scaler=%d, auto_scale=%d\n"
+		"    proxy_beep=%d render_beep=%d\n",
 		audio_tracks, audio_channels, sample_rate, video_tracks,
 		frame_rate, output_w, output_h, aspect_w, aspect_h,
 		decode_subtitles, subtitle_number, label_cells, program_no,
-		proxy_scale, proxy_use_scaler, proxy_auto_scale,
+		proxy_scale, proxy_disabled_scale, proxy_use_scaler, proxy_auto_scale,
 		proxy_beep, render_beep);
 }