X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.h;h=eddced8e0a6973a52d53a2776cd4ee306992ba0d;hp=bf0acbb905b0037c70d025168ef648e73dd131a9;hb=0c36fdb4fc4d4a2efe353e2b6eb0bf5a1b1485d6;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h
index bf0acbb9..eddced8e 100644
--- a/cinelerra-5.1/cinelerra/edlsession.h
+++ b/cinelerra-5.1/cinelerra/edlsession.h
@@ -22,6 +22,7 @@
 #ifndef EDLSESSION_H
 #define EDLSESSION_H
 
+#include "asset.inc"
 #include "autoconf.inc"
 #include "bcwindowbase.inc"
 #include "bchash.inc"
@@ -63,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
@@ -82,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
@@ -98,7 +97,7 @@ public:
 	float ruler_x2, ruler_y2;
 // Ruler points relative to the output frame.
 // Current folder in resource window
-	char current_folder[BCTEXTLEN];
+	int awindow_folder;
 // align cursor on frame boundaries
 	int cursor_on_frames;
 // paste keyframes to any track type
@@ -144,7 +143,7 @@ public:
 	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;
@@ -160,6 +159,8 @@ public:
 	int label_cells;
 	int program_no;
 	int playback_software_position;
+// current settings are scaled this much from the original settings
+        int proxy_scale;
 //	int playback_strategy;
 // Play audio in realtime priority
 	int real_time_playback;