proxy asset refs fix, sams last ffmpeg icons

[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 38dc34755767a24f05689a7a6f68ee879a3425da..d5d610ee742dc6a68edd5d9a61b630ae5953f0b6 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
@@ -144,7 +141,6 @@ 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,
 // // attach 1 standalone on the first track and share it with other tracks
@@ -162,6 +158,12 @@ public:
        int label_cells;
        int program_no;
        int playback_software_position;
+// current settings are scaled this much from the original settings
+        int proxy_scale;
+// upscale geom from proxy to session on read in
+        int proxy_use_scaler;
+// automatically rescale assets when loaded
+        int proxy_auto_scale;
 //     int playback_strategy;
 // Play audio in realtime priority
        int real_time_playback;