X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvmodule.C;h=89d00f59427d9ba70a59702a9559017b2286ca9d;hb=0678b17975f50a831fb8a1cda6baaa961e3b6de7;hp=6659dd4529e5305b11a053fc4b9c4b6ee47b9a03;hpb=12d4e343f31707c899e6e4daa10c68b172433cff;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C index 6659dd45..89d00f59 100644 --- a/cinelerra-5.1/cinelerra/vmodule.C +++ b/cinelerra-5.1/cinelerra/vmodule.C @@ -176,21 +176,15 @@ int VModule::import_frame(VFrame *output, VEdit *current_edit, delete nested_renderengine; nested_renderengine = 0; } - - if( !nested_command ) { + if( !nested_command ) nested_command = new TransportCommand; - } - - - if( !nested_renderengine ) { - nested_command->command = command; - 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, 1); - nested_renderengine->set_vcache(get_cache()); - nested_renderengine->arm_command(nested_command); - } + nested_command->command = command; + 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, 1); + nested_renderengine->set_vcache(get_cache()); + nested_renderengine->arm_command(nested_command); } else { @@ -255,7 +249,7 @@ int VModule::import_frame(VFrame *output, VEdit *current_edit, FloatAutos *speed_autos = (FloatAutos*)track->automation->autos[AUTOMATION_SPEED]; speed_position += speed_autos->automation_integral(edit_startproject, direction_position-edit_startproject, PLAY_FORWARD); -//printf("VModule::import_frame %d %lld %lld\n", __LINE__, position, (int64_t)speed_position); +//printf("VModule::import_frame %d %jd %jd\n", __LINE__, position, (int64_t)speed_position); position = (int64_t)speed_position; }