X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.h;h=b2994f181e602f07d20449b44c2601c37a4994c0;hb=refs%2Fheads%2Fmaster;hp=eebe71f2bac092bcfb9a3c3564a8773f7796e69f;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h index eebe71f2..4fe36219 100644 --- a/cinelerra-5.1/cinelerra/edlsession.h +++ b/cinelerra-5.1/cinelerra/edlsession.h @@ -2,6 +2,7 @@ /* * CINELERRA * Copyright (C) 2008-2015 Adam Williams + * Copyright (C) 2003-2016 Cinelerra CV contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -121,7 +122,6 @@ public: int cwindow_click2play; // CWindow clear color int cwindow_clear_color; - int cwindow_clear_alpha; // Transition char default_atransition[BCTEXTLEN]; char default_vtransition[BCTEXTLEN]; @@ -165,7 +165,7 @@ public: int program_no; int playback_software_position; // current settings are scaled this much from the original settings - int proxy_scale; + int proxy_scale, proxy_state; // original proxy_scale when proxy_enable disables/enables proxy int proxy_disabled_scale; // upscale geom from proxy to session on read in @@ -203,7 +203,6 @@ public: int show_assets; // Show titles in resources int show_titles; - int gang_tracks; // Test for data before rendering a track int test_playback_edits; // Format to display times in