X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplaybackengine.C;h=1d3a4115cef058b279ff5f1790b6d30d2ed64064;hb=f3adc7285af86851913b48592a8c4fdfcdcdf8b6;hp=802b7b610c24e04ed931085319a6310d3d0fa4f4;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C
index 802b7b61..1d3a4115 100644
--- a/cinelerra-5.1/cinelerra/playbackengine.C
+++ b/cinelerra-5.1/cinelerra/playbackengine.C
@@ -351,11 +351,9 @@ void PlaybackEngine::run()
 {
 	start_lock->unlock();
 
-	do
-	{
+	while( !done ) {
 // Wait for current command to finish
 		que->output_lock->lock("PlaybackEngine::run");
-
 		wait_render_engine();
 
 // Read the new command
@@ -365,69 +363,135 @@ void PlaybackEngine::run()
 		command->copy_from(&que->command);
 		que->command.reset();
 		que->input_lock->unlock();
-
 //printf("PlaybackEngine::run 1 %d\n", command->command);
 
-		switch(command->command)
-		{
+		switch( command->command ) {
 // Parameter change only
-			case COMMAND_NONE:
-//				command->command = last_command;
-				perform_change();
-				break;
-
-			case PAUSE:
-				init_cursor(0);
-				pause_lock->lock("PlaybackEngine::run");
-				stop_cursor();
-				break;
-
-			case STOP:
+		case COMMAND_NONE:
+//			command->command = last_command;
+			perform_change();
+			break;
+
+		case PAUSE:
+			init_cursor(0);
+			pause_lock->lock("PlaybackEngine::run");
+			stop_cursor();
+			break;
+
+		case STOP:
 // No changing
-				break;
+			break;
 
-			case CURRENT_FRAME:
-				last_command = command->command;
-				perform_change();
-				arm_render_engine();
+		case CURRENT_FRAME:
+			last_command = command->command;
+			perform_change();
+			arm_render_engine();
 // Dispatch the command
-				start_render_engine();
-				break;
-
-			default:
-				last_command = command->command;
-				is_playing_back = 1;
- 				if(command->command == SINGLE_FRAME_FWD ||
-					command->command == SINGLE_FRAME_REWIND)
-				{
- 					command->playbackstart = get_tracking_position();
-				}
+			start_render_engine();
+			break;
 
-				perform_change();
-				arm_render_engine();
+		case SINGLE_FRAME_FWD:
+		case SINGLE_FRAME_REWIND:
+// fall through
+		default:
+			last_command = command->command;
+			is_playing_back = 1;
+
+			perform_change();
+			arm_render_engine();
 
 // Start tracking after arming so the tracking position doesn't change.
 // The tracking for a single frame command occurs during PAUSE
-				init_tracking();
+			init_tracking();
 
 // Dispatch the command
-				start_render_engine();
-				break;
+			start_render_engine();
+			break;
 		}
 
 
 //printf("PlaybackEngine::run 100\n");
-	}while(!done);
+	}
 }
 
 
-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);
+}
+