Actually prevent uYou's playback from colliding with YouTube's

davit33 · Jan 28, 2024 · 880603f · 880603f
1 parent 61e55e1
commit 880603f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Sources/uYouPlusPatches.h b/Sources/uYouPlusPatches.h
@@ -10,9 +10,13 @@
 -(YTSingleVideoController *)activeVideo;
 @end
 
-// Prevent uYou player bar from showing when not playing downloaded media
 @interface PlayerManager : NSObject
+// Prevent uYou player bar from showing when not playing downloaded media
 - (float)progress;
+// Prevent uYou's playback from colliding with YouTube's
+- (void)setSource:(id)source;
+- (void)pause;
++ (id)sharedInstance;
 @end
 
 // iOS 16 uYou crash fix - @level3tjg: https://github.com/qnblackcat/uYouPlus/pull/224

diff --git a/Sources/uYouPlusPatches.xm b/Sources/uYouPlusPatches.xm
@@ -173,14 +173,17 @@ static void refreshUYouAppearance() {
 %end
 
 // Prevent uYou's playback from colliding with YouTube's
-BOOL isYTPlaybackActive = NO;
-%hook HAMPlayerInternal
-- (void)play { %orig; isYTPlaybackActive = YES; }
-- (void)terminate { %orig; isYTPlaybackActive = NO; }
+%hook PlayerVC
+- (void)close {
+    %orig;
+    [[%c(PlayerManager) sharedInstance] setSource:nil];
+}
 %end
-%hook PlayerManager
+%hook HAMPlayerInternal
 - (void)play {
-    if (isYTPlaybackActive) return;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [[%c(PlayerManager) sharedInstance] pause];
+    });
     %orig;
 }
 %end