X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=673ec070f77bb563f8a89e0c8c6d6600d24a42f8;hb=22c6251d37911a11e322bf7518e6a992ea0bb6c7;hp=448116aeccabe73b207e4f52ae17163affd95ab0;hpb=834732af87bfd7f1d4035109f31e48db12b415fa;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index 448116ae..673ec070 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -44,8 +44,9 @@ EDLSession::EDLSession(EDL *edl) for(int i = 0; i < MAXCHANNELS; i++) achannel_positions[i] = 0; assetlist_format = ASSETS_ICONS; + int xs100 = xS(100); for(int i = 0; i < ASSET_COLUMNS; i++) - asset_columns[i] = 100; + asset_columns[i] = xs100; auto_conf = new AutoConf; awindow_folder = AW_MEDIA_FOLDER; aspect_w = 4; aspect_h = 3; @@ -53,12 +54,13 @@ EDLSession::EDLSession(EDL *edl) audio_tracks = 2; autos_follow_edits = 1; // this is needed for predictability auto_keyframes = 0; + span_keyframes = 0; brender_start = brender_end = 0.0; clipboard_length = 0; // unused color_model = BC_RGBA8888; interlace_mode = ILACE_MODE_UNDETECTED; - crop_x1 = 0; crop_x2 = 320; - crop_y1 = 0; crop_y2 = 240; + crop_x1 = 0; crop_x2 = xS(320); + crop_y1 = 0; crop_y2 = yS(240); eyedrop_radius = 0; ruler_x1 = ruler_y1 = 0.0; ruler_x2 = ruler_y2 = 0.0; @@ -72,12 +74,14 @@ EDLSession::EDLSession(EDL *edl) cwindow_xscroll = cwindow_yscroll = 0; cwindow_zoom = 1.0; cwindow_click2play = 0; + cwindow_clear_color = BLACK; + cwindow_clear_alpha = 0; strcpy(default_atransition, INIT_ATRANSITION); strcpy(default_vtransition, INIT_VTRANSITION); default_transition_length = 1.0; - edit_handle_mode[0] = MOVE_EDGE; - edit_handle_mode[1] = MOVE_MEDIA; - edit_handle_mode[2] = MOVE_EDGE_MEDIA; + edit_handle_mode[0] = MOVE_RIPPLE; + edit_handle_mode[1] = MOVE_ROLL; + edit_handle_mode[2] = MOVE_SLIP; editing_mode = EDITING_IBEAM; enable_duplex = 1; folderlist_format = FOLDERS_ICONS; @@ -125,10 +129,12 @@ EDLSession::EDLSession(EDL *edl) scrub_speed = 2.; show_assets = 1; show_titles = 1; + gang_tracks = GANG_NONE; si_useduration = 1; si_duration = 3; test_playback_edits = 1; time_format = TIME_HMSF; + timecode_offset = 0; nudge_format = 1; tool_window = 0; for(int i = 0; i < MAXCHANNELS; i++) { @@ -177,7 +183,9 @@ int EDLSession::need_rerender(EDLSession *ptr) (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)); + (proxy_use_scaler != ptr->proxy_use_scaler) || + (cwindow_clear_color != ptr->cwindow_clear_color) || + (cwindow_clear_alpha != ptr->cwindow_clear_alpha)); } void EDLSession::equivalent_output(EDLSession *session, double *result) @@ -253,14 +261,16 @@ int EDLSession::load_defaults(BC_Hash *defaults) cwindow_yscroll = defaults->get("CWINDOW_YSCROLL", 0); cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1); cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0); + cwindow_clear_color = defaults->get("CWINDOW_CLEAR_COLOR", BLACK); + cwindow_clear_alpha = defaults->get("CWINDOW_CLEAR_ALPHA", 0); sprintf(default_atransition, INIT_ATRANSITION); defaults->get("DEFAULT_ATRANSITION", default_atransition); 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_EDGE); - edit_handle_mode[1] = defaults->get("EDIT_HANDLE_MODE1", MOVE_MEDIA); - edit_handle_mode[2] = defaults->get("EDIT_HANDLE_MODE2", MOVE_EDGE_MEDIA); + edit_handle_mode[0] = defaults->get("EDIT_HANDLE_MODE0", MOVE_RIPPLE); + edit_handle_mode[1] = defaults->get("EDIT_HANDLE_MODE1", MOVE_ROLL); + edit_handle_mode[2] = defaults->get("EDIT_HANDLE_MODE2", MOVE_SLIP); editing_mode = defaults->get("EDITING_MODE", EDITING_IBEAM); enable_duplex = defaults->get("ENABLE_DUPLEX", 1); folderlist_format = defaults->get("FOLDERLIST_FORMAT", FOLDERS_TEXT); @@ -274,6 +284,7 @@ int EDLSession::load_defaults(BC_Hash *defaults) single_standalone = defaults->get("SINGLE_STANDALONE", 1); playback_preload = defaults->get("PLAYBACK_PRELOAD", 0); auto_keyframes = defaults->get("AUTO_KEYFRAMES", 0); + span_keyframes = defaults->get("SPAN_KEYFRAMES", 0); meter_format = defaults->get("METER_FORMAT", METER_DB); min_meter_db = defaults->get("MIN_METER_DB", -85); max_meter_db = defaults->get("MAX_METER_DB", 6); @@ -315,8 +326,10 @@ int EDLSession::load_defaults(BC_Hash *defaults) show_assets = defaults->get("SHOW_ASSETS", 1); show_titles = defaults->get("SHOW_TITLES", 1); + gang_tracks = defaults->get("GANG_TRACKS", GANG_NONE); // test_playback_edits = defaults->get("TEST_PLAYBACK_EDITS", 1); time_format = defaults->get("TIME_FORMAT", TIME_HMSF); + timecode_offset = defaults->get("TIMECODE_OFFSET", timecode_offset); nudge_format = defaults->get("NUDGE_FORMAT", 1); tool_window = defaults->get("TOOL_WINDOW", 0); vconfig_in->load_defaults(defaults); @@ -399,6 +412,8 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("CWINDOW_YSCROLL", cwindow_yscroll); defaults->update("CWINDOW_ZOOM", cwindow_zoom); defaults->update("CWINDOW_CLICK2PLAY", cwindow_click2play); + defaults->update("CWINDOW_CLEAR_COLOR", cwindow_clear_color); + defaults->update("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha); defaults->update("DEFAULT_ATRANSITION", default_atransition); defaults->update("DEFAULT_VTRANSITION", default_vtransition); defaults->update("DEFAULT_TRANSITION_LENGTH", default_transition_length); @@ -419,6 +434,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("SINGLE_STANDALONE", single_standalone); defaults->update("PLAYBACK_PRELOAD", playback_preload); defaults->update("AUTO_KEYFRAMES", auto_keyframes); + defaults->update("SPAN_KEYFRAMES", span_keyframes); defaults->update("METER_FORMAT", meter_format); defaults->update("MIN_METER_DB", min_meter_db); defaults->update("MAX_METER_DB", max_meter_db); @@ -450,8 +466,10 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("SI_DURATION",si_duration); defaults->update("SHOW_ASSETS", show_assets); defaults->update("SHOW_TITLES", show_titles); + defaults->update("GANG_TRACKS", gang_tracks); // defaults->update("TEST_PLAYBACK_EDITS", test_playback_edits); defaults->update("TIME_FORMAT", time_format); + defaults->update("TIMECODE_OFFSET", timecode_offset); defaults->update("NUDGE_FORMAT", nudge_format); defaults->update("TOOL_WINDOW", tool_window); vconfig_in->save_defaults(defaults); @@ -489,7 +507,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) void EDLSession::boundaries() { Workarounds::clamp(audio_tracks, 0, (int)BC_INFINITY); - Workarounds::clamp(audio_channels, 1, MAXCHANNELS - 1); + Workarounds::clamp(audio_channels, 0, MAXCHANNELS - 1); Workarounds::clamp(sample_rate, 1, 1000000); Workarounds::clamp(video_tracks, 0, (int)BC_INFINITY); Workarounds::clamp(video_channels, 1, MAXCHANNELS - 1); @@ -597,6 +615,7 @@ int EDLSession::load_xml(FileXML *file, } auto_conf->load_xml(file); auto_keyframes = file->tag.get_property("AUTO_KEYFRAMES", auto_keyframes); + span_keyframes = file->tag.get_property("SPAN_KEYFRAMES", span_keyframes); autos_follow_edits = file->tag.get_property("AUTOS_FOLLOW_EDITS", autos_follow_edits); brender_start = file->tag.get_property("BRENDER_START", brender_start); brender_end = file->tag.get_property("BRENDER_END", brender_end); @@ -621,6 +640,8 @@ int EDLSession::load_xml(FileXML *file, 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); + cwindow_clear_color = file->tag.get_property("CWINDOW_CLEAR_COLOR", cwindow_clear_color); + cwindow_clear_alpha = file->tag.get_property("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha); 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); @@ -631,8 +652,10 @@ int EDLSession::load_xml(FileXML *file, safe_regions = file->tag.get_property("SAFE_REGIONS", safe_regions); show_assets = file->tag.get_property("SHOW_ASSETS", 1); show_titles = file->tag.get_property("SHOW_TITLES", 1); + gang_tracks = file->tag.get_property("GANG_TRACKS", GANG_NONE); // test_playback_edits = file->tag.get_property("TEST_PLAYBACK_EDITS", test_playback_edits); time_format = file->tag.get_property("TIME_FORMAT", time_format); + timecode_offset = file->tag.get_property("TIMECODE_OFFSET", timecode_offset); nudge_format = file->tag.get_property("NUDGE_FORMAT", nudge_format); tool_window = file->tag.get_property("TOOL_WINDOW", tool_window); vwindow_meter = file->tag.get_property("VWINDOW_METER", vwindow_meter); @@ -663,6 +686,7 @@ int EDLSession::save_xml(FileXML *file) } auto_conf->save_xml(file); file->tag.set_property("AUTO_KEYFRAMES", auto_keyframes); + file->tag.set_property("SPAN_KEYFRAMES", span_keyframes); file->tag.set_property("AUTOS_FOLLOW_EDITS", autos_follow_edits); file->tag.set_property("BRENDER_START", brender_start); file->tag.set_property("BRENDER_END", brender_end); @@ -687,6 +711,8 @@ int EDLSession::save_xml(FileXML *file) 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("CWINDOW_CLEAR_COLOR", cwindow_clear_color); + file->tag.set_property("CWINDOW_CLEAR_ALPHA", cwindow_clear_alpha); file->tag.set_property("EDITING_MODE", editing_mode); file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format); file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track); @@ -697,8 +723,10 @@ int EDLSession::save_xml(FileXML *file) file->tag.set_property("SAFE_REGIONS", safe_regions); file->tag.set_property("SHOW_ASSETS", show_assets); file->tag.set_property("SHOW_TITLES", show_titles); + file->tag.set_property("GANG_TRACKS", gang_tracks); file->tag.set_property("TEST_PLAYBACK_EDITS", test_playback_edits); file->tag.set_property("TIME_FORMAT", time_format); + file->tag.set_property("TIMECODE_OFFSET", timecode_offset); file->tag.set_property("NUDGE_FORMAT", nudge_format); file->tag.set_property("TOOL_WINDOW", tool_window); file->tag.set_property("VWINDOW_METER", vwindow_meter); @@ -822,6 +850,8 @@ int EDLSession::copy(EDLSession *session) cwindow_yscroll = session->cwindow_yscroll; cwindow_zoom = session->cwindow_zoom; cwindow_click2play = session->cwindow_click2play; + cwindow_clear_color = session->cwindow_clear_color; + cwindow_clear_alpha = session->cwindow_clear_alpha; strcpy(default_atransition, session->default_atransition); strcpy(default_vtransition, session->default_vtransition); default_transition_length = session->default_transition_length; @@ -841,6 +871,7 @@ int EDLSession::copy(EDLSession *session) plugins_follow_edits = session->plugins_follow_edits; single_standalone = session->single_standalone; auto_keyframes = session->auto_keyframes; + span_keyframes = session->span_keyframes; // last_playback_position = session->last_playback_position; meter_format = session->meter_format; min_meter_db = session->min_meter_db; @@ -870,8 +901,10 @@ int EDLSession::copy(EDLSession *session) si_duration = session->si_duration; show_assets = session->show_assets; show_titles = session->show_titles; + gang_tracks = session->gang_tracks; test_playback_edits = session->test_playback_edits; time_format = session->time_format; + timecode_offset = session->timecode_offset; nudge_format = session->nudge_format; tool_window = session->tool_window; for(int i = 0; i < MAXCHANNELS; i++) { @@ -910,7 +943,7 @@ void EDLSession::dump() " 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 disabled_scale=%d, use_scaler=%d, auto_scale=%d\n" - " proxy_beep=%d render_beep=%d\n", + " proxy_beep=%f render_beep=%f\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,