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

diff --git a/cinelerra-5.1/cinelerra/edlsession.h b/cinelerra-5.1/cinelerra/edlsession.h
index eddced8e..c1da8908 100644
--- a/cinelerra-5.1/cinelerra/edlsession.h
+++ b/cinelerra-5.1/cinelerra/edlsession.h
@@ -116,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];
@@ -141,7 +142,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
@@ -161,6 +161,12 @@ public:
 	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, render_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;