18 new shapewipe transitions from rafa, rework savefile/confirm for nested edl edits

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / theme.h

diff --git a/cinelerra-5.1/cinelerra/theme.h b/cinelerra-5.1/cinelerra/theme.h
index 028957cffd76567f318b55aaa7eaf99313b41f8a..f0eb5cf2299bc3ca28729d3c5b34c5609c457545 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.h
+++ b/cinelerra-5.1/cinelerra/theme.h
@@ -25,6 +25,7 @@
 #include "awindowgui.inc"
 #include "batchrender.inc"
 #include "bctheme.h"
+#include "compressortools.inc"
 #include "cwindowgui.inc"
 #include "guicast.h"
 #include "keyframegui.inc"
@@ -104,15 +105,8 @@ public:
        virtual void draw_lwindow_bg(LevelWindowGUI *gui);
        virtual void draw_mwindow_bg(MWindowGUI *gui);
        virtual void draw_vwindow_bg(VWindowGUI *gui);
-       virtual void draw_resource_bg(TrackCanvas *canvas,
-               ResourcePixmap *pixmap,
-               int edit_x,
-               int edit_w,
-               int pixmap_x,
-               int x1,
-               int y1,
-               int x2,
-               int y2);
+       virtual void draw_resource_bg(TrackCanvas *canvas, ResourcePixmap *pixmap, int color,
+               int edit_x, int edit_w, int pixmap_x, int x1, int y1, int x2, int y2);
 
        virtual void get_preferences_sizes();
        virtual void draw_preferences_bg(PreferencesWindow *gui);
@@ -171,7 +165,18 @@ public:
        int adivider_x, adivider_y, adivider_w, adivider_h;
        int afolders_x, afolders_y, afolders_w, afolders_h;
        int alist_x, alist_y, alist_w, alist_h;
+       int stack_button_w;
        int audio_color;
+// audio zero crossing
+       int zero_crossing_color;
+// compressor graph line
+       int graph_active_color;
+       int graph_inactive_color;
+// compressor graph background
+       int graph_grid_color;
+       int graph_bg_color;
+       int graph_border1_color;
+       int graph_border2_color;
        int assetedit_color;
        int browse_pad;
        int cauto_x, cauto_y, cauto_w, cauto_h;
@@ -329,6 +334,7 @@ public:
        VFrame **ffmpeg_toggle;
        VFrame **proxy_p_toggle;
        VFrame **proxy_s_toggle;
+       VFrame **mask_mode_toggle;
        VFrame **infoasset_data;
        VFrame **in_point;
        VFrame **insert_data;
@@ -337,6 +343,7 @@ public:
        VFrame **lift_data;
        VFrame *maskkeyframe_data;
        VFrame *modekeyframe_data;
+       VFrame *hardedge_data;
        VFrame **movedn_data;
        VFrame **moveup_data;
        VFrame **newbin_data;