Fixup

tillt · Jun 26, 2024 · df11ead · df11ead
1 parent 3d3a4d8
commit df11ead
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/PlayEm.xcodeproj/xcshareddata/xcschemes/PlayEm.xcscheme b/PlayEm.xcodeproj/xcshareddata/xcschemes/PlayEm.xcscheme
@@ -44,6 +44,7 @@
       debugServiceExtension = "internal"
       enableGPUFrameCaptureMode = "1"
       enableGPUValidationMode = "1"
+      showGraphicsOverview = "Yes"
       allowLocationSimulation = "NO">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

diff --git a/PlayEm/Info.plist b/PlayEm/Info.plist
@@ -68,7 +68,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>6792</string>
+	<string>6794</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.music</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/PlayEm/Window & ViewControllers/WaveWindowController.m b/PlayEm/Window & ViewControllers/WaveWindowController.m
@@ -167,16 +167,13 @@ - (void)renderCallback:(CADisplayLink *)sender
 
     ++counter;
 
-//    dispatch_async(_displayLinkQueue, ^{
-
-    AVAudioFramePosition delta = self.audioController.latency + [self.audioController frameCountDeltaWithTimeDelta:sender.duration];
-    AVAudioFramePosition frame = self.audioController.currentFrame >= delta ? self.audioController.currentFrame  - delta : self.audioController.currentFrame;
-    // Add the delay until the video gets visible to the playhead position for compensation
-//
-    [self updateScopeFrame:frame];
+    // Substract the latency introduced by the output device setup to compensate and get
+    // video in sync with audible audio.
+    AVAudioFramePosition delta = self.audioController.latency;
+    AVAudioFramePosition frame = self.audioController.currentFrame >= delta ? self.audioController.currentFrame + delta : self.audioController.currentFrame;
+    // Add the delay until the video gets visible to the playhead position for compensation.
+    frame += [self.audioController frameCountDeltaWithTimeDelta:sender.duration];
 
-//    AVAudioFramePosition frame = _audioController.currentFrame >= _audioController.latency ? _audioController.currentFrame  - _audioController.latency : _audioController.currentFrame;
-//    frame += [self.audioController frameCountDeltaWithTimeDelta:sender.duration];
     os_signpost_interval_begin(pointsOfInterest, POISetCurrentFrame, "SetCurrentFrame");
     self.currentFrame = frame;
     os_signpost_interval_end(pointsOfInterest, POISetCurrentFrame, "SetCurrentFrame");
@@ -1494,6 +1491,8 @@ - (void)setBPM:(float)bpm
 
 - (void)setCurrentFrame:(unsigned long long)frame
 {
+    [self updateScopeFrame:frame];
+
     if (_waveView.currentFrame == frame) {
         return;
     }