From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 11 Apr 2019 01:22:33 +0000 (-0600)
Subject: dont clear_output for single step for shuttle, shuttle fix for HI_JOG event
X-Git-Tag: 2019-08~70
X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=23fd26a10f3d8ecb8c3879622d604ad9d2bbfe77;hp=aa9374b902768107ebda0cffe739325ffed372f6

dont clear_output for single step for shuttle, shuttle fix for HI_JOG event
---

diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C
index 71126cf8..b9845f33 100644
--- a/cinelerra-5.1/cinelerra/playbackengine.C
+++ b/cinelerra-5.1/cinelerra/playbackengine.C
@@ -407,7 +407,8 @@ void PlaybackEngine::run()
 // Start tracking after arming so the tracking position doesn't change.
 // The tracking for a single frame command occurs during PAUSE
 			init_tracking();
-			clear_output();
+			if( !command->single_frame() )
+				clear_output();
 // Dispatch the command
 			start_render_engine();
 			break;
diff --git a/cinelerra-5.1/cinelerra/shuttle.C b/cinelerra-5.1/cinelerra/shuttle.C
index 4c780f1a..e8d5572b 100644
--- a/cinelerra-5.1/cinelerra/shuttle.C
+++ b/cinelerra-5.1/cinelerra/shuttle.C
@@ -603,6 +603,8 @@ void Shuttle::jogshuttle(unsigned short code, unsigned int value)
 	case EVENT_CODE_SHUTTLE:
 		shuttle(value);
 		break;
+	case EVENT_CODE_HI_JOG:  // redundant report of JOG value*120
+		break;
 	default:
 		fprintf(stderr, "jogshuttle(%d, %d) invalid code\n", code, value);
 		break;
diff --git a/cinelerra-5.1/cinelerra/shuttle.h b/cinelerra-5.1/cinelerra/shuttle.h
index 46283dfc..6793a03f 100644
--- a/cinelerra-5.1/cinelerra/shuttle.h
+++ b/cinelerra-5.1/cinelerra/shuttle.h
@@ -46,6 +46,7 @@ enum { JL=0,JR };
 // ev.code when ev.type == JOGSHUTTLE
 #define EVENT_CODE_JOG 7
 #define EVENT_CODE_SHUTTLE 8
+#define EVENT_CODE_HI_JOG 11
 
 // ev.value when ev.code == JOG
 // 8 bit value changing by one for each jog step