add clip folders, icon margins, fix safe regions, update neophyte, fix folder 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 4399626b128c85859785335add5e56d72f29be90..5261be1f96d3fbfc72b53974cc0b0dbc776a21c3 100644 (file)
--- a/cinelerra-5.1/cinelerra/localsession.h
+++ b/cinelerra-5.1/cinelerra/localsession.h
@@ -22,6 +22,7 @@
 #ifndef LOCALSESSION_H
 #define LOCALSESSION_H
 
+#include "automation.inc"
 #include "bcwindowbase.inc"
 #include "bchash.inc"
 #include "edl.inc"
@@ -76,8 +77,9 @@ public:
 // Title if clip
        char clip_title[BCTEXTLEN];
        char clip_notes[BCTEXTLEN];
-// Folder in parent EDL of clip
-       char folder[BCTEXTLEN];
+       char clip_icon[BCSTRLEN];
+// awindow folder id
+       int folder;
 
        int loop_playback;
        double loop_start, loop_end;
@@ -85,7 +87,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];
@@ -100,14 +102,16 @@ public:
        int64_t zoom_track;
 // Vertical automation scale
 
-       float automation_mins[6];
-       float automation_maxs[6];
+       float automation_mins[AUTOGROUPTYPE_COUNT];
+       float automation_maxs[AUTOGROUPTYPE_COUNT];
        int zoombar_showautotype;
 // Default type of float keyframe
        int floatauto_type;
 
 // 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.