upgrade ffmpeg to 3.4.2, add proxy popup, undo/redo deadlock fix, rework nested edl

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

diff --git a/cinelerra-5.1/cinelerra/localsession.h b/cinelerra-5.1/cinelerra/localsession.h
index c00f23185f0ab930f98a347a1d9b7bf096cee152..cd948aa323176e059895bbf8b20ebc18bc6a76b7 100644 (file)
--- a/cinelerra-5.1/cinelerra/localsession.h
+++ b/cinelerra-5.1/cinelerra/localsession.h
@@ -77,8 +77,10 @@ public:
 // Title if clip
        char clip_title[BCTEXTLEN];
        char clip_notes[BCTEXTLEN];
+       char clip_icon[BCSTRLEN];
+
 // Folder in parent EDL of clip
-       char folder[BCTEXTLEN];
+       int awindow_folder;
 
        int loop_playback;
        double loop_start, loop_end;
@@ -86,7 +88,7 @@ public:
        double preview_start, preview_end;
 
 // Vertical start of track view in pixels
-       int64_t track_start[TOTAL_PANES];
+       int track_start[TOTAL_PANES];
 // Horizontal start of view in pixels.  This has to be pixels since either
 // samples or seconds would require drawing in fractional pixels.
        int64_t view_start[TOTAL_PANES];
@@ -109,6 +111,8 @@ public:
 
 // Eye dropper
        float red, green, blue;
+       float red_max, green_max, blue_max;
+       int use_max;
 private:
 // The reason why selection ranges and inpoints have to be separate:
 // The selection position has to change to set new in points.