X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.h;h=4fe36219779c3e04d6a0039d713a45dcacbda79c;hb=6c6367a007ab0f67538ad165e5815e66183a3997;hp=7a383471ad3ecee8cf30a1ee9b355315df25d767;hpb=8fd64d1d3770c95e2a7cba1049e909cadb4e1fbf;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h index 7a383471..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,15 +165,15 @@ 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 int proxy_use_scaler; // automatically rescale assets when loaded int proxy_auto_scale; -// beep when proxy/render done - int proxy_beep, render_beep; +// beep gain when proxy/render done + float proxy_beep, render_beep; // int playback_strategy; // Play audio in realtime priority int real_time_playback; @@ -207,8 +207,8 @@ public: int test_playback_edits; // Format to display times in int time_format; -// Offset for timecode - int timecode_offset[4]; +// Offset for timecode units + double timecode_offset; // Format to display nudge in, either seconds or track units. int nudge_format; // Show tool window in CWindow