switch move/swap tracks, add mv trk shortcut, update msg

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

diff --git a/cinelerra-5.1/cinelerra/automation.h b/cinelerra-5.1/cinelerra/automation.h
index 47df6eca0859b63ee6f2dc2ebc2fcf7504522462..b626d66ad9f42139cf6b3c1401124bfb1f76a582 100644 (file)
--- a/cinelerra-5.1/cinelerra/automation.h
+++ b/cinelerra-5.1/cinelerra/automation.h
@@ -43,16 +43,16 @@
                value = INFINITYGAIN;                                   \
        if (autogrouptype == AUTOGROUPTYPE_VIDEO_FADE)                  \
                CLAMP(value, 0, 100);                                   \
-       if (autogrouptype == AUTOGROUPTYPE_ZOOM && value < 0)           \
-               value = 0;                                              \
-       else if (autogrouptype == AUTOGROUPTYPE_SPEED && value < 0.001) \
-               value = 0.001;
+       if (autogrouptype == AUTOGROUPTYPE_ZOOM && value < ZOOM_MIN)    \
+               value = ZOOM_MIN;                                       \
+       else if (autogrouptype == AUTOGROUPTYPE_SPEED && value < SPEED_MIN) \
+               value = SPEED_MIN;
 
 #define AUTOMATIONVIEWCLAMPS(value, autogrouptype)                     \
        if (autogrouptype == AUTOGROUPTYPE_ZOOM && value < 0)           \
                value = 0;                                              \
-       else if (autogrouptype == AUTOGROUPTYPE_SPEED && value < 0)     \
-               value = 0;
+       else if (autogrouptype == AUTOGROUPTYPE_SPEED && value < SPEED_MIN)     \
+               value = SPEED_MIN;
 
 
 class Automation
@@ -62,7 +62,7 @@ public:
        Automation(EDL *edl, Track *track);
        virtual ~Automation();
 
-       int autogrouptype(int autoidx, Track *track);
+       static int autogrouptype(int type, Track *track);
        virtual void create_objects();
        void equivalent_output(Automation *automation, int64_t *result);
        virtual Automation& operator=(Automation& automation);