bsd lang segv fix, enable bsd lv2, lv2 gui enable fix, proxy/ffmpeg toggle resize...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / edlsession.h

diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h
index a919b1037b7c8165723e75f5577d4f9f04728466..44d09974c908be3e0277c5bc8e733444432192fe 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.h
+++ b/cinelerra-5.1/cinelerra/edlsession.h
@@ -64,9 +64,6 @@ public:
        void equivalent_output(EDLSession *session, double *result);
        void dump();
 
-// calculates the frame offset for programme timecode
-       int64_t get_frame_offset();
-
 // Audio
        int achannel_positions[MAXCHANNELS];
 // AWindow format
@@ -83,8 +80,9 @@ public:
        int autos_follow_edits;
 // Generate keyframes for every tweek
        int auto_keyframes;
-// Where to start background rendering
+// Where to do background rendering
        double brender_start;
+       double brender_end;
 // Length of clipboard if pasting
        double clipboard_length;
 // Colormodel for intermediate frames
@@ -118,6 +116,7 @@ public:
        int cwindow_xscroll;
        int cwindow_yscroll;
        float cwindow_zoom;
+       int cwindow_click2play;
 // Transition
        char default_atransition[BCTEXTLEN];
        char default_vtransition[BCTEXTLEN];
@@ -143,9 +142,8 @@ public:
        int white_balance_raw;
 // labels follow edits during editing
        int labels_follow_edits;
-       int mpeg4_deblock;
        int plugins_follow_edits;
-// For main menu plugin attaching, 
+// For main menu plugin attaching,
 // // attach 1 standalone on the first track and share it with other tracks
        int single_standalone;
        int meter_format;
@@ -161,6 +159,16 @@ public:
        int label_cells;
        int program_no;
        int playback_software_position;
+// current settings are scaled this much from the original settings
+        int proxy_scale;
+// 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;
 //     int playback_strategy;
 // Play audio in realtime priority
        int real_time_playback;
@@ -211,7 +219,7 @@ public:
 // play every frame
        int video_every_frame;
 // decode video asynchronously
-       int video_asynchronous;
+//     int video_asynchronous;
        int video_tracks;
 // number of frames to write to disk at a time during video recording.
        int video_write_length;
@@ -219,6 +227,7 @@ public:
 // Use the vwindow meter or not
        int vwindow_meter;
        float vwindow_zoom;
+       int vwindow_click2play;
 
 // Global ID counter
        static int current_id;