splashgui text clr, faders/speed keyframe popup slider rework, reticle rework

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

diff --git a/cinelerra-5.1/cinelerra/apatchgui.h b/cinelerra-5.1/cinelerra/apatchgui.h
index c8342057b0ad4f318372d79891bbca2dac11688d..5b8411a43762677fc4da49c2f5ec1120a31ba552 100644 (file)
--- a/cinelerra-5.1/cinelerra/apatchgui.h
+++ b/cinelerra-5.1/cinelerra/apatchgui.h
@@ -39,7 +39,7 @@ public:
        void create_objects();
        int reposition(int x, int y);
        int update(int x, int y);
-       void synchronize_fade(float value_change);
+       void update_faders(float v);
 
        ATrack *atrack;
        AFadePatch *fade;
@@ -50,11 +50,9 @@ public:
 class AFadePatch : public BC_FSlider
 {
 public:
-       AFadePatch(MWindow *mwindow, APatchGUI *patch, int x, int y, int w);
+       AFadePatch(APatchGUI *patch, int x, int y, int w, float v);
        static FloatAuto* get_keyframe(MWindow *mwindow, APatchGUI *patch);
        virtual int handle_event();
-       float update_edl();
-       MWindow *mwindow;
        APatchGUI *patch;
 };
 
@@ -63,17 +61,37 @@ class AKeyFadePatch : public BC_SubWindow
 public:
        AKeyFadePatch(MWindow *mwindow, APatchGUI *patch, int x, int y);
        void create_objects();
+       void update(float v);
 
        MWindow *mwindow;
        APatchGUI *patch;
-       AKeyFadeValue *akey_fade_value;
+       AKeyFadeOK *akey_fade_ok;
+       AKeyFadeText *akey_fade_text;
+       AKeyFadeSlider *akey_fade_slider;
+};
+
+class AKeyFadeOK : public BC_Button
+{
+public:
+       AKeyFadeOK(AKeyFadePatch *akey_fade_patch, int x, int y, VFrame **images);
+       int handle_event();
+
+       AKeyFadePatch *akey_fade_patch;
+};
+
+class AKeyFadeText : public BC_TextBox
+{
+public:
+       AKeyFadeText(AKeyFadePatch *akey_fade_patch, int x, int y, int w, float v);
+       int handle_event();
+
+       AKeyFadePatch *akey_fade_patch;
 };
 
-class AKeyFadeValue : public AFadePatch
+class AKeyFadeSlider : public AFadePatch
 {
 public:
-       AKeyFadeValue(AKeyFadePatch *akey_fade_patch);
-       int button_release_event();
+       AKeyFadeSlider(AKeyFadePatch *akey_fade_patch, int x, int y, int w, float v);
        int handle_event();
 
        AKeyFadePatch *akey_fade_patch;
@@ -94,7 +112,6 @@ class AKeyPanPatch : public APanPatch
 {
 public:
        AKeyPanPatch(MWindow *mwindow, APatchGUI *patch);
-       int button_release_event();
        int handle_event();
 };