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=c65e53f1ba977f0041cb1ed067e1e1f417862f76;hb=09ccfde5a1fd65069f69b37490462b7ccf38a336;hpb=0c36fdb4fc4d4a2efe353e2b6eb0bf5a1b1485d6 diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index c65e53f1..1eb9b6b9 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; @@ -87,7 +88,6 @@ EDLSession::EDLSession(EDL *edl) interpolate_raw = 1; white_balance_raw = 1; labels_follow_edits = 1; - mpeg4_deblock = 1; plugins_follow_edits = 1; single_standalone = 1; meter_format = METER_DB; @@ -99,6 +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; @@ -115,15 +120,17 @@ EDLSession::EDLSession(EDL *edl) record_write_length = 131072; record_realtime_toc = 1; - safe_regions = 0; + safe_regions = 0; sample_rate = 48000; - scrub_speed = 2.; - show_assets = 1; - show_titles = 1; + 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; - tool_window = 0; + nudge_format = 1; + tool_window = 0; for(int i = 0; i < MAXCHANNELS; i++) { vchannel_x[i] = 64*i; vchannel_y[i] = 0; @@ -132,13 +139,14 @@ EDLSession::EDLSession(EDL *edl) aconfig_in = new AudioInConfig; vconfig_in = new VideoInConfig; recording_format = new Asset; - video_every_frame = 0; - video_asynchronous = 0; + video_every_frame = 0; +// video_asynchronous = 0; video_tracks = 1; video_write_length = 30; - view_follows_playback = 1; - vwindow_meter = 0; - vwindow_zoom = 1.; + view_follows_playback = 1; + vwindow_meter = 0; + vwindow_zoom = 1.; + vwindow_click2play = 0; playback_config = new PlaybackConfig; } @@ -158,7 +166,7 @@ int EDLSession::need_rerender(EDLSession *ptr) return ((playback_preload != ptr->playback_preload) || (interpolation_type != ptr->interpolation_type) || (video_every_frame != ptr->video_every_frame) || - (video_asynchronous != ptr->video_asynchronous) || +// (video_asynchronous != ptr->video_asynchronous) || (real_time_playback != ptr->real_time_playback) || (playback_software_position != ptr->playback_software_position) || (test_playback_edits != ptr->test_playback_edits) || @@ -167,7 +175,9 @@ int EDLSession::need_rerender(EDLSession *ptr) (subtitle_number != ptr->subtitle_number) || (interpolate_raw != ptr->interpolate_raw) || (white_balance_raw != ptr->white_balance_raw) || - (proxy_scale != ptr->proxy_scale)); + (proxy_disabled_scale != ptr->proxy_disabled_scale) || + (proxy_scale != ptr->proxy_scale) || + (proxy_use_scaler != ptr->proxy_use_scaler)); } void EDLSession::equivalent_output(EDLSession *session, double *result) @@ -179,10 +189,11 @@ void EDLSession::equivalent_output(EDLSession *session, double *result) session->interpolation_type != interpolation_type || session->interpolate_raw != interpolate_raw || session->white_balance_raw != white_balance_raw || - session->mpeg4_deblock != mpeg4_deblock || session->decode_subtitles != decode_subtitles || session->subtitle_number != subtitle_number || - session->proxy_scale != proxy_scale ) + session->proxy_disabled_scale != proxy_disabled_scale || + session->proxy_scale != proxy_scale || + session->proxy_use_scaler != proxy_use_scaler ) *result = 0; // If it's before the current brender_start, render extra data. @@ -192,25 +203,16 @@ void EDLSession::equivalent_output(EDLSession *session, double *result) *result = brender_start; } - int EDLSession::load_defaults(BC_Hash *defaults) { char string[BCTEXTLEN]; + audio_channels = defaults->get("ACHANNELS", audio_channels); + audio_tracks = defaults->get("ATRACKS", audio_tracks); // Default channel positions - for(int i = 0; i < MAXCHANNELS; i++) - { + for( int i=0; iget(string, default_position); + achannel_positions[i] = defaults->get(string, + default_audio_channel_position(i, audio_channels)); } aconfig_in->load_defaults(defaults); assetlist_format = defaults->get("ASSETLIST_FORMAT", ASSETS_ICONS); @@ -221,8 +223,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) sprintf(string, "ASSET_COLUMN%d", i); asset_columns[i] = defaults->get(string, 100); } - audio_channels = defaults->get("ACHANNELS", audio_channels); - audio_tracks = defaults->get("ATRACKS", audio_tracks); auto_conf->load_defaults(defaults); autos_follow_edits = defaults->get("AUTOS_FOLLOW_EDITS", 1); brender_start = defaults->get("BRENDER_START", brender_start); @@ -241,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); @@ -252,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); @@ -276,7 +277,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) 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); - mpeg4_deblock = defaults->get("MPEG4_DEBLOCK", mpeg4_deblock); output_w = defaults->get("OUTPUTW", output_w); output_h = defaults->get("OUTPUTH", output_h); playback_buffer = defaults->get("PLAYBACK_BUFFER", 4096); @@ -284,7 +284,6 @@ int EDLSession::load_defaults(BC_Hash *defaults) delete playback_config; playback_config = new PlaybackConfig; playback_config->load_defaults(defaults); -// proxy_scale = defaults->get("PROXY_SCALE", 1); real_time_playback = defaults->get("PLAYBACK_REALTIME", 0); real_time_record = defaults->get("REALTIME_RECORD", 0); record_positioning = defaults->get("RECORD_POSITIONING", 1); @@ -330,17 +329,20 @@ int EDLSession::load_defaults(BC_Hash *defaults) } video_channels = defaults->get("VCHANNELS", video_channels); video_every_frame = defaults->get("VIDEO_EVERY_FRAME", 0); - video_asynchronous = defaults->get("VIDEO_ASYNCHRONOUS", 0); +// video_asynchronous = defaults->get("VIDEO_ASYNCHRONOUS", 0); video_tracks = defaults->get("VTRACKS", video_tracks); video_write_length = defaults->get("VIDEO_WRITE_LENGTH", 30); 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(); @@ -396,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); @@ -419,14 +422,12 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("METER_FORMAT", meter_format); defaults->update("MIN_METER_DB", min_meter_db); defaults->update("MAX_METER_DB", max_meter_db); - defaults->update("MPEG4_DEBLOCK", mpeg4_deblock); defaults->update("OUTPUTW", output_w); defaults->update("OUTPUTH", output_h); defaults->update("PLAYBACK_BUFFER", playback_buffer); defaults->update("PLAYBACK_SOFTWARE_POSITION", playback_software_position); playback_config->save_defaults(defaults); defaults->update("PLAYBACK_REALTIME", real_time_playback); -// defaults->update("PROXY_SCALE", proxy_scale); defaults->update("REALTIME_RECORD", real_time_record); defaults->update("RECORD_POSITIONING", record_positioning); defaults->update("RECORD_RAW_STREAM", record_raw_stream); @@ -445,7 +446,7 @@ int EDLSession::save_defaults(BC_Hash *defaults) defaults->update("SAFE_REGIONS", safe_regions); defaults->update("SAMPLERATE", sample_rate); defaults->update("SCRUB_SPEED", scrub_speed); - defaults->update("SI_USEDURATION",si_useduration); + defaults->update("SI_USEDURATION",si_useduration); defaults->update("SI_DURATION",si_duration); defaults->update("SHOW_ASSETS", show_assets); defaults->update("SHOW_TITLES", show_titles); @@ -462,18 +463,20 @@ int EDLSession::save_defaults(BC_Hash *defaults) } defaults->update("VCHANNELS", video_channels); defaults->update("VIDEO_EVERY_FRAME", video_every_frame); - defaults->update("VIDEO_ASYNCHRONOUS", video_asynchronous); +// defaults->update("VIDEO_ASYNCHRONOUS", video_asynchronous); defaults->update("VTRACKS", video_tracks); defaults->update("VIDEO_WRITE_LENGTH", video_write_length); 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; } @@ -553,6 +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); return 0; } @@ -562,8 +568,6 @@ int EDLSession::load_audio_config(FileXML *file, int append_mode, uint32_t load_ // load channels setting if(append_mode) return 0; audio_channels = file->tag.get_property("CHANNELS", (int64_t)audio_channels); - - for(int i = 0; i < audio_channels; i++) { sprintf(string, "ACHANNEL_ANGLE_%d", i); @@ -605,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); @@ -622,11 +620,11 @@ 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); labels_follow_edits = file->tag.get_property("LABELS_FOLLOW_EDITS", labels_follow_edits); - mpeg4_deblock = file->tag.get_property("MPEG4_DEBLOCK", mpeg4_deblock); plugins_follow_edits = file->tag.get_property("PLUGINS_FOLLOW_EDITS", plugins_follow_edits); single_standalone = file->tag.get_property("SINGLE_STANDALONE", single_standalone); playback_preload = file->tag.get_property("PLAYBACK_PRELOAD", playback_preload); @@ -639,12 +637,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(); } @@ -686,11 +686,11 @@ 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); file->tag.set_property("LABELS_FOLLOW_EDITS", labels_follow_edits); - file->tag.set_property("MPEG4_DEBLOCK", mpeg4_deblock); file->tag.set_property("PLUGINS_FOLLOW_EDITS", plugins_follow_edits); file->tag.set_property("SINGLE_STANDALONE", single_standalone); file->tag.set_property("PLAYBACK_PRELOAD", playback_preload); @@ -703,9 +703,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"); @@ -727,7 +730,7 @@ int EDLSession::save_video_config(FileXML *file) file->tag.set_property("COLORMODEL", string); ilacemode_to_xmltext(string, interlace_mode); file->tag.set_property("INTERLACE_MODE",string); - file->tag.set_property("CHANNELS", video_channels); + file->tag.set_property("CHANNELS", video_channels); for(int i = 0; i < video_channels; i++) { sprintf(string, "VCHANNEL_X_%d", i); @@ -743,6 +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->append_tag(); file->tag.set_title("/VIDEO"); file->append_tag(); @@ -815,6 +821,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; @@ -838,7 +845,6 @@ int EDLSession::copy(EDLSession *session) meter_format = session->meter_format; min_meter_db = session->min_meter_db; max_meter_db = session->max_meter_db; - mpeg4_deblock = session->mpeg4_deblock; output_w = session->output_w; output_h = session->output_h; playback_buffer = session->playback_buffer; @@ -875,13 +881,19 @@ int EDLSession::copy(EDLSession *session) video_channels = session->video_channels; *vconfig_in = *session->vconfig_in; video_every_frame = session->video_every_frame; - video_asynchronous = session->video_asynchronous; +// video_asynchronous = session->video_asynchronous; video_tracks = session->video_tracks; video_write_length = session->video_write_length; 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; @@ -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 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_scale, proxy_disabled_scale, proxy_use_scaler, proxy_auto_scale, + proxy_beep, render_beep); }