change to id based refs for plugins, save plugin on/off in edit drag/drop, fix transi...

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

diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C
index 1c32c3fcdd89b4671ba139192f66380e0c0b91d4..6659dd4529e5305b11a053fc4b9c4b6ee47b9a03 100644 (file)
--- a/cinelerra-5.1/cinelerra/vmodule.C
+++ b/cinelerra-5.1/cinelerra/vmodule.C
@@ -56,7 +56,6 @@
 #include "vplugin.h"
 #include "vtrack.h"
 #include <string.h>
-#include "interlacemodes.h"
 #include "maskengine.h"
 #include "automation.h"
 
@@ -368,38 +367,6 @@ int VModule::import_frame(VFrame *output, VEdit *current_edit,
 
 // printf("VModule::import_frame %d %f %d %f %d\n",
 // __LINE__, in_w, asset_w, in_h, asset_h);
-//
-//                     printf("VModule::import_frame 1 [ilace] Project: mode (%d) Asset: autofixoption (%d), mode (%d), method (%d)\n",
-//                     get_edl()->session->interlace_mode,
-//                     current_edit->asset->interlace_autofixoption,
-//                     current_edit->asset->interlace_mode,
-//                     current_edit->asset->interlace_fixmethod);
-
-                       // Determine the interlacing method to use.
-                       int interlace_fixmethod = !current_edit->asset ? ILACE_FIXMETHOD_NONE :
-                                ilaceautofixmethod2(get_edl()->session->interlace_mode,
-                                       current_edit->asset->interlace_autofixoption,
-                                       current_edit->asset->interlace_mode,
-                                       current_edit->asset->interlace_fixmethod);
-//
-//                     char string[BCTEXTLEN];
-//                     ilacefixmethod_to_text(string,interlace_fixmethod);
-//                     printf("VModule::import_frame 1 [ilace] Compensating by using: '%s'\n",string);
-
-                       // Compensate for the said interlacing...
-                       switch( interlace_fixmethod ) {
-                               case ILACE_FIXMETHOD_NONE:
-
-                               break;
-                               case ILACE_FIXMETHOD_UPONE:
-                                       out_y--;
-                               break;
-                               case ILACE_FIXMETHOD_DOWNONE:
-                                       out_y++;
-                               break;
-                               default:
-                                       printf("vmodule::importframe WARNING - unknown fix method for interlacing, no compensation in effect\n");
-                       }
 
 // file -> temp -> output
                        if( !EQUIV(in_x, 0) ||
@@ -726,6 +693,7 @@ int VModule::render(VFrame *output,
        VEdit* previous_edit = 0;
 //printf("VModule::render %d %p %ld %d\n", __LINE__, current_edit, start_position_project, direction);
 
+       Plugin *transition = get_edl()->tracks->plugin_exists(transition_id);
        if( debug_render )
                printf("    VModule::render %d %d %jd %s transition=%p opengl=%d current_edit=%p output=%p\n",
                        __LINE__, use_nudge, start_position_project, track->title,