X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=9bdb6458192f00ed7811f44f43ef9db688fc8d45;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=69ac0f73032561ed44056fa72fd60636cedb5412;hpb=74afbc29ac4ce9d94d53e10342979f2c59f1f193;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index 69ac0f73..9bdb6458 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -71,8 +71,9 @@ EDLSession::EDLSession(EDL *edl) cwindow_scrollbars = 0; cwindow_xscroll = cwindow_yscroll = 0; cwindow_zoom = 1.0; - 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; @@ -98,8 +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; @@ -121,6 +125,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; @@ -140,6 +146,7 @@ EDLSession::EDLSession(EDL *edl) view_follows_playback = 1; vwindow_meter = 0; vwindow_zoom = 1.; + vwindow_click2play = 0; playback_config = new PlaybackConfig; } @@ -168,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)); } @@ -183,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; @@ -243,9 +252,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); - 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); @@ -325,11 +335,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", 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(); @@ -385,6 +398,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("CWINDOW_XSCROLL", cwindow_xscroll); defaults->update("CWINDOW_YSCROLL", cwindow_yscroll); defaults->update("CWINDOW_ZOOM", cwindow_zoom); + defaults->update("CWINDOW_CLICK2PLAY", cwindow_click2play); defaults->update("DEFAULT_ATRANSITION", default_atransition); defaults->update("DEFAULT_VTRANSITION", default_vtransition); defaults->update("DEFAULT_TRANSITION_LENGTH", default_transition_length); @@ -455,12 +469,14 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("VIEW_FOLLOWS_PLAYBACK", view_follows_playback); defaults->update("VWINDOW_METER", vwindow_meter); defaults->update("VWINDOW_ZOOM", vwindow_zoom); + defaults->update("VWINDOW_CLICK2PLAY", vwindow_click2play); defaults->update("DECODE_SUBTITLES", decode_subtitles); 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; } @@ -540,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; @@ -609,6 +626,7 @@ int EDLSession::load_xml(FileXML *file, cwindow_xscroll = file->tag.get_property("CWINDOW_XSCROLL", cwindow_xscroll); cwindow_yscroll = file->tag.get_property("CWINDOW_YSCROLL", cwindow_yscroll); cwindow_zoom = file->tag.get_property("CWINDOW_ZOOM", cwindow_zoom); + cwindow_click2play = file->tag.get_property("CWINDOW_CLICK2PLAY", cwindow_click2play); editing_mode = file->tag.get_property("EDITING_MODE", editing_mode); folderlist_format = file->tag.get_property("FOLDERLIST_FORMAT", folderlist_format); highlighted_track = file->tag.get_property("HIGHLIGHTED_TRACK", 0); @@ -625,12 +643,14 @@ int EDLSession::load_xml(FileXML *file, tool_window = file->tag.get_property("TOOL_WINDOW", tool_window); vwindow_meter = file->tag.get_property("VWINDOW_METER", vwindow_meter); vwindow_zoom = file->tag.get_property("VWINDOW_ZOOM", vwindow_zoom); + vwindow_click2play = file->tag.get_property("VWINDOW_CLICK2PLAY", vwindow_click2play); decode_subtitles = file->tag.get_property("DECODE_SUBTITLES", decode_subtitles); 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(); } @@ -672,6 +692,7 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("CWINDOW_XSCROLL", cwindow_xscroll); file->tag.set_property("CWINDOW_YSCROLL", cwindow_yscroll); file->tag.set_property("CWINDOW_ZOOM", cwindow_zoom); + file->tag.set_property("CWINDOW_CLICK2PLAY", cwindow_click2play); file->tag.set_property("EDITING_MODE", editing_mode); file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format); file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track); @@ -688,9 +709,12 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("TOOL_WINDOW", tool_window); file->tag.set_property("VWINDOW_METER", vwindow_meter); file->tag.set_property("VWINDOW_ZOOM", vwindow_zoom); + file->tag.set_property("VWINDOW_CLICK2PLAY", vwindow_click2play); 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"); @@ -728,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(); @@ -802,6 +827,7 @@ int EDLSession::copy(EDLSession *session) cwindow_xscroll = session->cwindow_xscroll; cwindow_yscroll = session->cwindow_yscroll; cwindow_zoom = session->cwindow_zoom; + cwindow_click2play = session->cwindow_click2play; strcpy(default_atransition, session->default_atransition); strcpy(default_vtransition, session->default_vtransition); default_transition_length = session->default_transition_length; @@ -867,9 +893,13 @@ int EDLSession::copy(EDLSession *session) view_follows_playback = session->view_follows_playback; vwindow_meter = session->vwindow_meter; 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; @@ -885,10 +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 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); }