Merge pull request #1518 from FullstackJack/tvos-pip-regression

Fix tvOS picture-in-picture compilation regression.
TheWidlarzGroup · Mar 13, 2019 · 9016d19 · 9016d19
2 parents f710df5 + 5dbf7e2
commit 9016d19
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/ios/Video/RCTVideo.h b/ios/Video/RCTVideo.h
@@ -15,6 +15,8 @@
 @class RCTEventDispatcher;
 #if __has_include(<react-native-video/RCTVideoCache.h>)
 @interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, DVAssetLoaderDelegatesDelegate>
+#elif TARGET_OS_TV
+@interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate>
 #else
 @interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate>
 #endif

diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
@@ -27,8 +27,6 @@ @implementation RCTVideo
   AVPlayer *_player;
   AVPlayerItem *_playerItem;
   NSDictionary *_source;
-  AVPictureInPictureController *_pipController;
-  void (^__strong _Nonnull _restoreUserInterfaceForPIPStopCompletionHandler)(BOOL);
   BOOL _playerItemObserversSet;
   BOOL _playerBufferEmpty;
   AVPlayerLayer *_playerLayer;
@@ -79,6 +77,10 @@ @implementation RCTVideo
 #if __has_include(<react-native-video/RCTVideoCache.h>)
   RCTVideoCache * _videoCache;
 #endif
+#if TARGET_OS_IOS
+  void (^__strong _Nonnull _restoreUserInterfaceForPIPStopCompletionHandler)(BOOL);
+  AVPictureInPictureController *_pipController;
+#endif
 }
 
 - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
@@ -103,9 +105,11 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
     _playInBackground = false;
     _allowsExternalPlayback = YES;
     _playWhenInactive = false;
-	_pictureInPicture = false;
+    _pictureInPicture = false;
     _ignoreSilentSwitch = @"inherit"; // inherit, ignore, obey
-	_restoreUserInterfaceForPIPStopCompletionHandler = NULL;
+#if TARGET_OS_IOS
+    _restoreUserInterfaceForPIPStopCompletionHandler = NULL;
+#endif
 #if __has_include(<react-native-video/RCTVideoCache.h>)
     _videoCache = [RCTVideoCache sharedInstance];
 #endif
@@ -793,6 +797,7 @@ - (void)setPlayWhenInactive:(BOOL)playWhenInactive
 
 - (void)setPictureInPicture:(BOOL)pictureInPicture
 {
+  #if TARGET_OS_IOS
   if (_pictureInPicture == pictureInPicture) {
     return;
   }
@@ -807,8 +812,10 @@ - (void)setPictureInPicture:(BOOL)pictureInPicture
       [_pipController stopPictureInPicture];
 	});
   }
+  #endif
 }
 
+#if TARGET_OS_IOS
 - (void)setRestoreUserInterfaceForPIPStopCompletionHandler:(BOOL)restore
 {
   if (_restoreUserInterfaceForPIPStopCompletionHandler != NULL) {
@@ -824,6 +831,7 @@ - (void)setupPipController {
     _pipController.delegate = self;
   }
 }
+#endif
 
 - (void)setIgnoreSilentSwitch:(NSString *)ignoreSilentSwitch
 {
@@ -1279,8 +1287,9 @@ - (void)usePlayerLayer
 
     [self.layer addSublayer:_playerLayer];
     self.layer.needsDisplayOnBoundsChange = YES;
-
+    #if TARGET_OS_IOS
     [self setupPipController];
+    #endif
   }
 }
 
@@ -1539,19 +1548,20 @@ - (NSString *)cacheDirectoryPath {
 
 #pragma mark - Picture in Picture
 
+#if TARGET_OS_IOS
 - (void)pictureInPictureControllerDidStopPictureInPicture:(AVPictureInPictureController *)pictureInPictureController {
   if (self.onPictureInPictureStatusChanged) {
     self.onPictureInPictureStatusChanged(@{
-										   @"isActive": [NSNumber numberWithBool:false]
-										   });
+      @"isActive": [NSNumber numberWithBool:false]
+    });
   }
 }
 
 - (void)pictureInPictureControllerDidStartPictureInPicture:(AVPictureInPictureController *)pictureInPictureController {
   if (self.onPictureInPictureStatusChanged) {
     self.onPictureInPictureStatusChanged(@{
-										   @"isActive": [NSNumber numberWithBool:true]
-										   });
+      @"isActive": [NSNumber numberWithBool:true]
+    });
   }
 }
 
@@ -1574,5 +1584,6 @@ - (void)pictureInPictureController:(AVPictureInPictureController *)pictureInPict
   }
   _restoreUserInterfaceForPIPStopCompletionHandler = completionHandler;
 }
+#endif
 
 @end