add preset mask shapes, add ctr/nrml btns, new igor icons, enables apply to mask...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / edl.C

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index cc2e84fb3c7b128ab5ecb5716f0c8bb310979fd5..fd481cea332c1628fabc683a8b2b8301ef15aa98 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -41,7 +41,6 @@
 #include "keyframe.h"
 #include "keyframes.h"
 #include "indexstate.h"
-#include "interlacemodes.h"
 #include "labels.h"
 #include "localsession.h"
 #include "maskautos.h"
@@ -802,6 +801,11 @@ int EDL::clear(double start, double end,
        return 0;
 }
 
+int EDL::clear_hard_edges(double start, double end)
+{
+       return tracks->clear_hard_edges(start, end);
+}
+
 static int dead_edit_cmp(Edit**ap, Edit**bp)
 {
        Edit *a = *ap, *b = *bp;
@@ -1432,14 +1436,7 @@ if( debug ) printf("EDL::get_use_vconsole %d\n", __LINE__);
            asset->height != session->output_h )
                return 1;
 
-
 if( debug ) printf("EDL::get_use_vconsole %d\n", __LINE__);
-// Asset and output device must have same resulting de-interlacing method
-       if( ilaceautofixmethod2(session->interlace_mode,
-           asset->interlace_autofixoption, asset->interlace_mode,
-           asset->interlace_fixmethod) != ILACE_FIXMETHOD_NONE )
-               return 1;
-
 // If we get here the frame is going to be directly copied.  Whether it is
 // decompressed in hardware depends on the colormodel.
        return 0;