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 71126cf82810c6fce05b7c2a1aa9dae7ce4c273b..b9845f33f66d17836a1754ba27b3eb1f58e5a334 100644 (file)
--- 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();
 // 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;
 // Dispatch the command
                        start_render_engine();
                        break;

diff --git a/cinelerra-5.1/cinelerra/shuttle.C b/cinelerra-5.1/cinelerra/shuttle.C
index 4c780f1a6021105972acd6a627bbc060b4ee7c77..e8d5572b82571425656773bae387a40f34bc9d0c 100644 (file)
--- 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_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;
        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 46283dfc82b9f1a1ec2065d3335f2ea69dea88ac..6793a03fb3463b73ae9acdb08375a6f6cc3cdef6 100644 (file)
--- 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
 // 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
 
 // ev.value when ev.code == JOG
 // 8 bit value changing by one for each jog step