downgrade dav1d to 5.1 seek fails, bg clr uses alpha=1, renderfarm hang fix, fix...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / edlsession.C

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 74eb3471d944ea832c0165c19bc98cf2952e2838..f3044f6d64aca49bad91b9ab86f2235c7771b801 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -75,7 +75,6 @@ EDLSession::EDLSession(EDL *edl)
        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;
@@ -134,6 +133,7 @@ EDLSession::EDLSession(EDL *edl)
        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++) {
@@ -183,8 +183,7 @@ int EDLSession::need_rerender(EDLSession *ptr)
                (proxy_disabled_scale != ptr->proxy_disabled_scale) ||
                (proxy_scale != ptr->proxy_scale) ||
                (proxy_use_scaler != ptr->proxy_use_scaler) ||
-               (cwindow_clear_color != ptr->cwindow_clear_color) ||
-               (cwindow_clear_alpha != ptr->cwindow_clear_alpha));
+               (cwindow_clear_color != ptr->cwindow_clear_color));
 }
 
 void EDLSession::equivalent_output(EDLSession *session, double *result)
@@ -261,7 +260,6 @@ int EDLSession::load_defaults(BC_Hash *defaults)
        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);
@@ -328,6 +326,7 @@ int EDLSession::load_defaults(BC_Hash *defaults)
        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);
@@ -411,7 +410,6 @@ int EDLSession::save_defaults(BC_Hash *defaults)
        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);
@@ -467,6 +465,7 @@ int EDLSession::save_defaults(BC_Hash *defaults)
        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);
@@ -638,7 +637,6 @@ int EDLSession::load_xml(FileXML *file,
                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);
@@ -652,6 +650,7 @@ int EDLSession::load_xml(FileXML *file,
                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);
@@ -708,7 +707,6 @@ int EDLSession::save_xml(FileXML *file)
        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);
@@ -722,6 +720,7 @@ int EDLSession::save_xml(FileXML *file)
        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);
@@ -846,7 +845,6 @@ int EDLSession::copy(EDLSession *session)
        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;
@@ -899,6 +897,7 @@ int EDLSession::copy(EDLSession *session)
        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++) {