X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frenderengine.C;h=0d8b06342fba9f7d1896f53f62aa06c29f7e5763;hb=2fba7eab40198b35d9edb20c16bcc1b8c262f7a2;hp=ed991791f4e147e901da032af26dda5b89bab6e0;hpb=aa9374b902768107ebda0cffe739325ffed372f6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C
index ed991791..0d8b0634 100644
--- a/cinelerra-5.1/cinelerra/renderengine.C
+++ b/cinelerra-5.1/cinelerra/renderengine.C
@@ -24,6 +24,7 @@
 #include "asset.h"
 #include "audiodevice.h"
 #include "bcsignals.h"
+#include "canvas.h"
 #include "condition.h"
 #include "edl.h"
 #include "edlsession.h"
@@ -468,18 +469,16 @@ void RenderEngine::run()
 	close_output();
 
 	if( playback_engine ) {
-		double position = command->command == CURRENT_FRAME ? command->playbackstart :
+		double position = command->command == CURRENT_FRAME ||
+				command->command == LAST_FRAME ? command->playbackstart :
 			playback_engine->is_playing_back && !interrupted ?
 				( command->get_direction() == PLAY_FORWARD ?
 					command->end_position : command->start_position ) :
 				playback_engine->get_tracking_position() ;
-		if( command->displacement ) {
-			position -= 1./command->get_edl()->session->frame_rate;
-			if( position < 0 ) position = 0;
-		}
+		position -= command->displacement;
+		if( position < 0 ) position = 0;
 		playback_engine->is_playing_back = 0;
-		playback_engine->tracking_position = position;
-		playback_engine->stop_tracking();
+		playback_engine->stop_tracking(position);
 	}
 
 	render_active->unlock();
@@ -493,3 +492,11 @@ void RenderEngine::wait_done()
 	render_active->unlock();
 }
 
+void RenderEngine::update_scope(VFrame *frame)
+{
+	if( !video || !output || !output->scope_on() ) return;
+	output->lock_canvas("RenderEngine::update_scope");
+	output->process_scope(video, frame);
+	output->unlock_canvas();
+}
+