Merge branch 'feature/pip-fix-improvement' into develop

SRGSSR · Jan 6, 2021 · 516ebc2 · 516ebc2
2 parents 8215253 + 9b49908
commit 516ebc2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Sources/SRGMediaPlayer/SRGPictureInPictureFix.m b/Sources/SRGMediaPlayer/SRGPictureInPictureFix.m
@@ -48,14 +48,14 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
         // Somehow Apple manages to circumvent this issue internally with `AVPlayerViewController` which, if
         // displayed once, ensures proper behavior afterwards.
         SRGDummyPlayerViewController *playerViewController = [[SRGDummyPlayerViewController alloc] init];
-        playerViewController.modalPresentationStyle = UIModalPresentationOverCurrentContext;
-        playerViewController.definesPresentationContext = NO;
         playerViewController.player = [AVPlayer new];
 
-        UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
-        [rootViewController presentViewController:playerViewController animated:NO completion:^{
-            [rootViewController dismissViewControllerAnimated:NO completion:nil];
-        }];
+        UIView *playerView = playerViewController.view;
+        UIWindow *keyWindow = UIApplication.sharedApplication.keyWindow;
+        [keyWindow addSubview:playerView];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [playerView removeFromSuperview];
+        });
     });
 }