merge: mask fixes/upgrades, overlay plugin rework, popup menu tweak

[goodguy/history.git] / cinelerra-5.1 / cinelerra / automation.C

diff --git a/cinelerra-5.1/cinelerra/automation.C b/cinelerra-5.1/cinelerra/automation.C
index fd2de32255718b163389b2ee930cf71ce82f3ee0..298618af3359bedfe9ec9163d5fc91d4ee599f6b 100644 (file)
--- a/cinelerra-5.1/cinelerra/automation.C
+++ b/cinelerra-5.1/cinelerra/automation.C
@@ -76,9 +76,11 @@ int Automation::autogrouptype(int autoidx, Track *track)
                        break;
                case AUTOMATION_CAMERA_Z:
                case AUTOMATION_PROJECTOR_Z:
-               case AUTOMATION_SPEED:
                        autogrouptype = AUTOGROUPTYPE_ZOOM;
                        break;
+               case AUTOMATION_SPEED:
+                       autogrouptype = AUTOGROUPTYPE_SPEED;
+                       break;
                case AUTOMATION_FADE:
                        if (track->data_type == TRACK_AUDIO)
                                autogrouptype = AUTOGROUPTYPE_AUDIO_FADE;
@@ -100,6 +102,7 @@ void Automation::create_objects()
        autos[AUTOMATION_MUTE]->autogrouptype = AUTOGROUPTYPE_INT255;
        autos[AUTOMATION_SPEED] = new FloatAutos(edl, track, 1.0);
        autos[AUTOMATION_SPEED]->create_objects();
+       autos[AUTOMATION_SPEED]->autogrouptype = AUTOGROUPTYPE_SPEED;
 }
 
 Automation& Automation::operator=(Automation& automation)