X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fautomation.C;h=a407a4899eb22a430dfc62e187d53414c736672b;hp=fd2de32255718b163389b2ee930cf71ce82f3ee0;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=ea0f83a2b769f440ac637ceee4fca5ea85340cdf diff --git a/cinelerra-5.1/cinelerra/automation.C b/cinelerra-5.1/cinelerra/automation.C index fd2de322..a407a489 100644 --- a/cinelerra-5.1/cinelerra/automation.C +++ b/cinelerra-5.1/cinelerra/automation.C @@ -24,7 +24,7 @@ #include "autos.h" #include "atrack.inc" #include "bcsignals.h" -#include "colors.h" +#include "bccolors.h" #include "edl.h" #include "edlsession.h" #include "filexml.h" @@ -41,6 +41,7 @@ int Automation::autogrouptypes_fixedrange[] = 0, 0, 0, + 0, 1 }; @@ -76,9 +77,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; @@ -98,8 +101,6 @@ void Automation::create_objects() autos[AUTOMATION_MUTE]->create_objects(); autos[AUTOMATION_MUTE]->autoidx = AUTOMATION_MUTE; autos[AUTOMATION_MUTE]->autogrouptype = AUTOGROUPTYPE_INT255; - autos[AUTOMATION_SPEED] = new FloatAutos(edl, track, 1.0); - autos[AUTOMATION_SPEED]->create_objects(); } Automation& Automation::operator=(Automation& automation)