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

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 5c663922..e0d5f701 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -71,9 +71,9 @@ EDLSession::EDLSession(EDL *edl)
 	cwindow_scrollbars = 0;
 	cwindow_xscroll = cwindow_yscroll = 0;
 	cwindow_zoom = 1.0;
-	cwindow_click2play = 1;
-	strcpy(default_atransition, "");
-	strcpy(default_vtransition, "");
+	cwindow_click2play = 0;
+	strcpy(default_atransition, INIT_ATRANSITION);
+	strcpy(default_vtransition, INIT_VTRANSITION);
 	default_transition_length = 1.0;
 	edit_handle_mode[0] = MOVE_ALL_EDITS;
 	edit_handle_mode[1] = MOVE_ONE_EDIT;
@@ -101,6 +101,8 @@ EDLSession::EDLSession(EDL *edl)
 	proxy_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;
@@ -122,6 +124,8 @@ EDLSession::EDLSession(EDL *edl)
 	scrub_speed = 2.;
 	show_assets = 1;
 	show_titles = 1;
+	si_useduration = 1;
+	si_duration = 3;
 	test_playback_edits = 1;
 	time_format = TIME_HMSF;
 	nudge_format = 1;
@@ -141,7 +145,7 @@ EDLSession::EDLSession(EDL *edl)
 	view_follows_playback = 1;
 	vwindow_meter = 0;
 	vwindow_zoom = 1.;
-	vwindow_click2play = 1;
+	vwindow_click2play = 0;
 
 	playback_config = new PlaybackConfig;
 }
@@ -245,10 +249,10 @@ 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);
-	cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 1);
-	sprintf(default_atransition, _("Crossfade"));
+	cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0);
+	sprintf(default_atransition, INIT_ATRANSITION);
 	defaults->get("DEFAULT_ATRANSITION", default_atransition);
-	sprintf(default_vtransition, _("Dissolve"));
+	sprintf(default_vtransition, INIT_VTRANSITION);
 	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);
@@ -328,12 +332,14 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	view_follows_playback = defaults->get("VIEW_FOLLOWS_PLAYBACK", 1);
 	vwindow_meter = defaults->get("VWINDOW_METER", 0);
 	vwindow_zoom = defaults->get("VWINDOW_ZOOM", (float)1);
-	vwindow_click2play = defaults->get("VWINDOW_CLICK2PLAY", 1);
+	vwindow_click2play = defaults->get("VWINDOW_CLICK2PLAY", 0);
 
 	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);
+	proxy_beep = defaults->get("PROXY_BEEP", proxy_beep);
+	render_beep = defaults->get("RENDER_BEEP", render_beep);
 
 	boundaries();
 
@@ -466,7 +472,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;
 }
 
@@ -638,7 +645,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();
 	}
 
@@ -701,6 +709,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");
@@ -882,6 +892,8 @@ int EDLSession::copy(EDLSession *session)
 	proxy_scale = session->proxy_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;
@@ -897,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\n",
+		"    proxy_scale=%d\n proxy_use_scaler=%d, proxy_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_use_scaler, proxy_auto_scale,
+		proxy_beep, render_beep);
 }