Add sub-delay key binding.

bbirec · May 1, 2016 · d9666aa · d9666aa
1 parent e887983
commit d9666aa
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 0 deletions.
diff --git a/PeerPlayer.xcodeproj/xcuserdata/bbirec.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/PeerPlayer.xcodeproj/xcuserdata/bbirec.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -27,5 +27,69 @@
             </Actions>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PeerPlayer/MpvController.m"
+            timestampString = "483771180.732346"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "318"
+            endingLineNumber = "318"
+            landmarkName = "-updateInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PeerPlayer/MpvController.m"
+            timestampString = "483771180.732346"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "287"
+            endingLineNumber = "287"
+            landmarkName = "-updateInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PeerPlayer/MpvController.m"
+            timestampString = "483771180.732346"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
+            landmarkName = "-updateInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PeerPlayer/MpvController.m"
+            timestampString = "483771256.417592"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "317"
+            endingLineNumber = "317"
+            landmarkName = "-updateInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/PeerPlayer/MpvController.h b/PeerPlayer/MpvController.h
@@ -23,6 +23,7 @@
 @property double cacheDuration; // in seconds
 @property BOOL paused;
 @property double volume;
+@property double subDelay;
 
 @end
 
@@ -69,5 +70,6 @@ typedef NS_ENUM(NSUInteger, PlayEndReason) {
 -(void) seek:(int)seconds;
 -(void) volume:(double)vol;
 -(void) loadSubtitle:(NSString*)filepath;
+-(void) subDelay:(double)delay;
 
 @end
diff --git a/PeerPlayer/MpvController.m b/PeerPlayer/MpvController.m
@@ -160,6 +160,7 @@ -(id) initWithWindow:(MpvWindow*) window {
         mpv_observe_property(mpv, 0, "volume", MPV_FORMAT_DOUBLE);
         mpv_observe_property(mpv, 0, "track-list", MPV_FORMAT_NODE);
         mpv_observe_property(mpv, 0, "video-params", MPV_FORMAT_NODE);
+        mpv_observe_property(mpv, 0, "sub-delay", MPV_FORMAT_DOUBLE);
 
         // Deal with MPV in the background.
         queue = dispatch_queue_create("mpv", DISPATCH_QUEUE_SERIAL);
@@ -237,6 +238,15 @@ -(void) loadSubtitle:(NSString*)filepath {
     });
 }
 
+-(void) subDelay:(double)delay {
+    dispatch_async(queue, ^{
+        double d;
+        mpv_get_property(mpv, "sub-delay", MPV_FORMAT_DOUBLE, &d);
+        d += delay;
+        mpv_set_property(mpv, "sub-delay", MPV_FORMAT_DOUBLE, (void*)&d);
+    });
+}
+
 -(void) quit {
     mpv_opengl_cb_uninit_gl(self.window.glView.mpvGL);
     [self.window.glView clearGLContext];
@@ -303,6 +313,12 @@ -(void) updateInfo:(mpv_event_property*) prop {
         NSDictionary* data = [MpvEvent convertProperty:prop];
         [self performSelectorOnMainThread:@selector(gotVideoParam:) withObject:data waitUntilDone:NO];
     }
+    else if(strcmp(prop->name, "sub-delay") == 0) {
+        self.info.subDelay = [[MpvEvent convertProperty:prop] doubleValue];
+        [self playInfoChanged];
+    }
+
+
 }
 
 - (void) readEvents

diff --git a/PeerPlayer/RootView.m b/PeerPlayer/RootView.m
@@ -54,6 +54,14 @@ -(void) keyDown:(NSEvent *)event
         case 36:
             [self.window toggleFullScreen:self];
             break;
+        // z
+        case 6:
+            [[MpvController getInstance] subDelay:-0.1f];
+            break;
+        // x
+        case 7:
+            [[MpvController getInstance] subDelay:0.1f];
+            break;
         // Esc
         case 53:
             if([self isFullscreen]) {