lv2 rework, sams ffmpeg icons, elision patch

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

diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C
index 6bba1270831170ccf60a0ec3e21a46c42d7f96f3..177f33504d46b276a8812822b50b5b23592cc911 100644 (file)
--- a/cinelerra-5.1/cinelerra/renderengine.C
+++ b/cinelerra-5.1/cinelerra/renderengine.C
@@ -516,7 +516,7 @@ void RenderEngine::run()
 // Fix the tracking position
        if(playback_engine)
        {
-               if(command->command == CURRENT_FRAME)
+               if(command->command == CURRENT_FRAME || command->command == LAST_FRAME)
                {
 //printf("RenderEngine::run 4.1 %d\n", playback_engine->tracking_position);
                        playback_engine->tracking_position = command->playbackstart;
@@ -527,17 +527,9 @@ void RenderEngine::run()
 //printf("RenderEngine::run 4.1 %d\n", playback_engine->tracking_position);
                        if(!interrupted)
                        {
-                               if(do_audio)
-                                       playback_engine->tracking_position =
-                                               (double)arender->current_position /
-                                                       command->get_edl()->session->sample_rate;
-                               else
-                               if(do_video)
-                               {
-                                       playback_engine->tracking_position =
-                                               (double)vrender->current_position /
-                                                       command->get_edl()->session->frame_rate;
-                               }
+                               playback_engine->tracking_position =
+                                       command->get_direction() == PLAY_FORWARD ?
+                                               command->end_position : command->start_position;
                        }
 
                        if( playback_engine->is_playing_back && command->displacement ) {