X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvmodule.C;h=93d6f4d9e4fa73f782018ca5806db825312f43d3;hb=007f72698b0aff633dae4bfded4d58791ab359e9;hp=6d69dc3c454acad0f656caed4f423ecd79da85f2;hpb=87141f1b454130848c34efdea9cf832d17463830;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C
index 6d69dc3c..93d6f4d9 100644
--- a/cinelerra-5.1/cinelerra/vmodule.C
+++ b/cinelerra-5.1/cinelerra/vmodule.C
@@ -233,11 +233,7 @@ int VModule::import_frame(VFrame *output,
 				nested_command->get_edl()->copy_all(nested_edl);
 				nested_command->change_type = CHANGE_ALL;
 				nested_command->realtime = renderengine->command->realtime;
-				nested_renderengine = new RenderEngine(0,
-					get_preferences(),
-					0,
-					renderengine ? renderengine->channeldb : 0,
-					1);
+				nested_renderengine = new RenderEngine(0, get_preferences(), 0, 1);
 				nested_renderengine->set_vcache(get_cache());
 				nested_renderengine->arm_command(nested_command);
 			}
@@ -453,7 +449,7 @@ int VModule::import_frame(VFrame *output,
 //			current_edit->asset->interlace_fixmethod);
 
 			// Determine the interlacing method to use.
-			int interlace_fixmethod = !current_edit->asset ? BC_ILACE_FIXMETHOD_NONE :
+			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,
@@ -465,13 +461,13 @@ int VModule::import_frame(VFrame *output,
 
 			// Compensate for the said interlacing...
 			switch (interlace_fixmethod) {
-				case BC_ILACE_FIXMETHOD_NONE:
+				case ILACE_FIXMETHOD_NONE:
 
 				break;
-				case BC_ILACE_FIXMETHOD_UPONE:
+				case ILACE_FIXMETHOD_UPONE:
 					out_y--;
 				break;
-				case BC_ILACE_FIXMETHOD_DOWNONE:
+				case ILACE_FIXMETHOD_DOWNONE:
 					out_y++;
 				break;
 				default:
@@ -976,7 +972,7 @@ int VModule::render(VFrame *output,
 //printf("VModule::render %d %p %ld %d\n", __LINE__, current_edit, start_position_project, direction);
 
 	if(debug_render)
-		printf("    VModule::render %d %d %ld %s transition=%p opengl=%d current_edit=%p output=%p\n",
+		printf("    VModule::render %d %d %jd %s transition=%p opengl=%d current_edit=%p output=%p\n",
 			__LINE__,
 			use_nudge,
 			start_position_project,