X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.h;h=a9679e8fcb8a916be7340f6a2adc2daa4f470ba9;hb=976d56536456148f6d14a2c12630c20e367abbe1;hp=a919b1037b7c8165723e75f5577d4f9f04728466;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h
index a919b103..a9679e8f 100644
--- 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,14 @@ 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;
+// beep when proxy render done
+        int proxy_beep;
 //	int playback_strategy;
 // Play audio in realtime priority
 	int real_time_playback;
@@ -211,7 +217,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 +225,7 @@ public:
 // Use the vwindow meter or not
 	int vwindow_meter;
 	float vwindow_zoom;
+	int vwindow_click2play;
 
 // Global ID counter
 	static int current_id;