version update, undo fix

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

diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C
index 7dcea2df1f6203d348dbb5ad096e0f427c535699..1d3a4115cef058b279ff5f1790b6d30d2ed64064 100644 (file)
--- a/cinelerra-5.1/cinelerra/playbackengine.C
+++ b/cinelerra-5.1/cinelerra/playbackengine.C
@@ -415,13 +415,83 @@ void PlaybackEngine::run()
 }
 
 
-void PlaybackEngine::stop_playback()
+void PlaybackEngine::stop_playback(int wait)
 {
        que->send_command(STOP, CHANGE_NONE, 0, 0);
-       interrupt_playback(1);
+       interrupt_playback(wait);
        renderengine_lock->lock("PlaybackEngine::stop_playback");
        if(render_engine)
                render_engine->wait_done();
        renderengine_lock->unlock();
 }
 
+
+void PlaybackEngine::issue_command(EDL *edl, int command, int wait_tracking,
+               int use_inout, int update_refresh, int toggle_audio)
+{
+//printf("PlayTransport::handle_transport 1 %d\n", command);
+// Stop requires transferring the output buffer to a refresh buffer.
+       int do_stop = 0, resume = 0;
+       int prev_command = this->command->command;
+       int prev_single_frame = this->command->single_frame();
+       int prev_audio = this->command->audio_toggle ?
+                !prev_single_frame : prev_single_frame;
+       int cur_single_frame = TransportCommand::single_frame(command);
+       int cur_audio = toggle_audio ?
+                !cur_single_frame : cur_single_frame;
+
+// Dispatch command
+       switch(command) {
+       case FAST_REWIND:       // Commands that play back
+       case NORMAL_REWIND:
+       case SLOW_REWIND:
+       case SINGLE_FRAME_REWIND:
+       case SINGLE_FRAME_FWD:
+       case SLOW_FWD:
+       case NORMAL_FWD:
+       case FAST_FWD:
+               if( !prev_single_frame &&
+                   prev_command == command &&
+                   cur_audio == prev_audio ) {
+// Same direction pressed twice and no change in audio state,  Stop
+                       do_stop = 1;
+                       break;
+               }
+// Resume or change direction
+               switch( prev_command ) {
+               default:
+                       que->send_command(STOP, CHANGE_NONE, 0, 0);
+                       interrupt_playback(wait_tracking);
+                       resume = 1;
+// fall through
+               case STOP:
+               case COMMAND_NONE:
+               case SINGLE_FRAME_FWD:
+               case SINGLE_FRAME_REWIND:
+// Start from scratch
+                       que->send_command(command, CHANGE_NONE, edl,
+                               1, resume, use_inout, toggle_audio,
+                               mwindow->preferences->forward_render_displacement);
+                       break;
+               }
+               break;
+
+// Commands that stop
+       case STOP:
+       case REWIND:
+       case GOTO_END:
+               do_stop = 1;
+               break;
+       }
+
+       if( do_stop ) {
+               que->send_command(STOP, CHANGE_NONE, 0, 0);
+               interrupt_playback(wait_tracking);
+       }
+}
+
+void PlaybackEngine::refresh_frame(int change_type, EDL *edl)
+{
+       que->send_command(CURRENT_FRAME, change_type, edl, 1);
+}
+