X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=69ac0f73032561ed44056fa72fd60636cedb5412;hb=d94bbdeebde4f16a77c388f9f28114b945db41d9;hp=5876b9198bc96b101da278af04e160d8c5b056f6;hpb=2f1bbd12877daf745e1d18b62b731f04cece827e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C index 5876b919..69ac0f73 100644 --- a/cinelerra-5.1/cinelerra/edlsession.C +++ b/cinelerra-5.1/cinelerra/edlsession.C @@ -116,15 +116,15 @@ 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; 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; @@ -133,13 +133,13 @@ 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.; playback_config = new PlaybackConfig; } @@ -159,7 +159,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 +167,9 @@ int EDLSession::need_rerender(EDLSession *ptr) (decode_subtitles != ptr->decode_subtitles) || (subtitle_number != ptr->subtitle_number) || (interpolate_raw != ptr->interpolate_raw) || - (white_balance_raw != ptr->white_balance_raw)); + (white_balance_raw != ptr->white_balance_raw) || + (proxy_scale != ptr->proxy_scale) || + (proxy_use_scaler != ptr->proxy_use_scaler)); } void EDLSession::equivalent_output(EDLSession *session, double *result) @@ -192,25 +194,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 +214,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); @@ -328,7 +319,7 @@ 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); @@ -441,7 +432,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); @@ -458,7 +449,7 @@ 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); @@ -560,8 +551,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); @@ -723,7 +712,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); @@ -872,7 +861,7 @@ 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;