improve resize flash operation, fixup xv grab/ungrab, fixup label updates

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

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index d1d904aa795647605031cf3df393e4fbf5f7a181..d32d38b566892062a9e932b51e885eda66f3b235 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -35,6 +35,7 @@
 #include "filexml.h"
 #include "guicast.h"
 #include "indexstate.h"
+#include "interlacemodes.h"
 #include "labels.h"
 #include "localsession.h"
 #include "mutex.h"
@@ -1023,7 +1024,7 @@ int EDL::dump(FILE *fp)
                local_session->loop_end);
        for(int i = 0; i < TOTAL_PANES; i++)
        {
-               fprintf(fp,"  pane %d view_start=%jd track_start=%jd\n", i,
+               fprintf(fp,"  pane %d view_start=%jd track_start=%d\n", i,
                        local_session->view_start[i],
                        local_session->track_start[i]);
        }
@@ -1448,20 +1449,23 @@ if(debug) printf("EDL::get_use_vconsole %d\n", __LINE__);
 
 if(debug) printf("EDL::get_use_vconsole %d\n", __LINE__);
 // Edit is not a nested EDL
+       Asset *asset = (*playable_edit)->asset;
 // Edit is silence
-       if(!(*playable_edit)->asset) return 1;
+       if(!asset) return 1;
 if(debug) printf("EDL::get_use_vconsole %d\n", __LINE__);
 
-
 // Asset and output device must have the same dimensions
-       if((*playable_edit)->asset->width != session->output_w ||
-               (*playable_edit)->asset->height != session->output_h)
+       if( asset->width != session->output_w ||
+           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) != BC_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.