X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=1eb9b6b986752f07917ffba50b45a6bacb055746;hp=f2c3e6321fc1a6cbd7511ae8d9fe4a33dac8fd02;hb=09ccfde5a1fd65069f69b37490462b7ccf38a336;hpb=976d56536456148f6d14a2c12630c20e367abbe1

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index f2c3e632..1eb9b6b9 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -99,9 +99,11 @@ 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;
+	render_beep = 0;
 	decode_subtitles = 0;
 	subtitle_number = 0;
 	label_cells = 0;
@@ -173,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));
 }
@@ -188,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;
@@ -237,7 +241,7 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	ruler_x2 = defaults->get("RULER_X2", 0.0);
 	ruler_y1 = defaults->get("RULER_Y1", 0.0);
 	ruler_y2 = defaults->get("RULER_Y2", 0.0);
-	awindow_folder = defaults->get("AWINDOW_FOLDER", awindow_folder);
+	awindow_folder = defaults->get("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
 	cursor_on_frames = defaults->get("CURSOR_ON_FRAMES", 1);
 	typeless_keyframes = defaults->get("TYPELESS_KEYFRAMES", 0);
 	cwindow_dest = defaults->get("CWINDOW_DEST", 0);
@@ -337,6 +341,8 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	subtitle_number = defaults->get("SUBTITLE_NUMBER", subtitle_number);
 	label_cells = defaults->get("LABEL_CELLS", label_cells);
 	program_no = defaults->get("PROGRAM_NO", program_no);
+	proxy_beep = defaults->get("PROXY_BEEP", proxy_beep);
+	render_beep = defaults->get("RENDER_BEEP", render_beep);
 
 	boundaries();
 
@@ -469,7 +475,8 @@ int EDLSession::save_defaults(BC_Hash *defaults)
 	defaults->update("SUBTITLE_NUMBER", subtitle_number);
 	defaults->update("LABEL_CELLS", label_cells);
 	defaults->update("PROGRAM_NO", program_no);
-
+	defaults->update("PROXY_BEEP", proxy_beep);
+	defaults->update("RENDER_BEEP", render_beep);
 	return 0;
 }
 
@@ -549,9 +556,9 @@ 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);
-	proxy_beep = file->tag.get_property("PROXY_BEEP", proxy_beep);
 	return 0;
 }
 
@@ -602,13 +609,7 @@ int EDLSession::load_xml(FileXML *file,
 		ruler_y1 = file->tag.get_property("RULER_Y1", ruler_y1);
 		ruler_x2 = file->tag.get_property("RULER_X2", ruler_x2);
 		ruler_y2 = file->tag.get_property("RULER_Y2", ruler_y2);
-		string[0] = 0;
-		file->tag.get_property("CURRENT_FOLDER", string);
-		if( string[0] ) {
-			awindow_folder = AWindowGUI::folder_number(string);
-			if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
-		}
-		file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
+		awindow_folder = file->tag.get_property("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
 		cursor_on_frames = file->tag.get_property("CURSOR_ON_FRAMES", cursor_on_frames);
 		typeless_keyframes = file->tag.get_property("TYPELESS_KEYFRAMES", typeless_keyframes);
 		cwindow_dest = file->tag.get_property("CWINDOW_DEST", cwindow_dest);
@@ -642,7 +643,8 @@ 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);
-
+		proxy_beep = file->tag.get_property("PROXY_BEEP", proxy_beep);
+		render_beep = file->tag.get_property("RENDER_BEEP", render_beep);
 		boundaries();
 	}
 
@@ -705,6 +707,8 @@ int EDLSession::save_xml(FileXML *file)
 
 	file->tag.set_property("DECODE_SUBTITLES", decode_subtitles);
 	file->tag.set_property("SUBTITLE_NUMBER", subtitle_number);
+	file->tag.set_property("PROXY_BEEP", proxy_beep);
+	file->tag.set_property("RENDER_BEEP", render_beep);
 
 	file->append_tag();
 	file->tag.set_title("/SESSION");
@@ -742,9 +746,9 @@ 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->tag.set_property("PROXY_BEEP", proxy_beep);
 	file->append_tag();
 	file->tag.set_title("/VIDEO");
 	file->append_tag();
@@ -885,9 +889,11 @@ 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;
+	render_beep = session->render_beep;
 
 	subtitle_number = session->subtitle_number;
 	decode_subtitles = session->decode_subtitles;
@@ -903,10 +909,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 proxy_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_beep);
+		proxy_scale, proxy_disabled_scale, proxy_use_scaler, proxy_auto_scale,
+		proxy_beep, render_beep);
 }