olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[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..a407a4899eb22a430dfc62e187d53414c736672b 100644 (file)
--- 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)