railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix tvos available compile errors

Browse Source
This commit is contained in:
Konstantin Späth 2023-08-12 12:18:47 +02:00
parent 30d8146916
commit a7a03901f2
4 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ios/Video/Features/RCTPlayerOperations.swift
View File

@ -112,7 +112,7 @@ enum RCTPlayerOperations {
} }
} }
} else { // default. invalid type or "system" } else { // default. invalid type or "system"
#if TARGET_OS_TV #if os(tvOS)
// Do noting. Fix for tvOS native audio menu language selector // Do noting. Fix for tvOS native audio menu language selector
#else #else
player?.currentItem?.selectMediaOptionAutomatically(in: group) player?.currentItem?.selectMediaOptionAutomatically(in: group)
@ -120,7 +120,7 @@ enum RCTPlayerOperations {
#endif #endif
} }
#if TARGET_OS_TV #if os(tvOS)
// Do noting. Fix for tvOS native audio menu language selector // Do noting. Fix for tvOS native audio menu language selector
#else #else
// If a match isn't found, option will be nil and text tracks will be disabled // If a match isn't found, option will be nil and text tracks will be disabled
@ -213,6 +213,7 @@ enum RCTPlayerOperations {
try audioSession.setCategory(category, options: options) try audioSession.setCategory(category, options: options)
} catch { } catch {
debugPrint("[RCTPlayerOperations] Problem setting up AVAudioSession category and options. Error: \(error).") debugPrint("[RCTPlayerOperations] Problem setting up AVAudioSession category and options. Error: \(error).")
#if !os(tvOS)
// Handle specific set category and option combination error // Handle specific set category and option combination error
// setCategory:AVAudioSessionCategoryPlayback withOptions:mixWithOthers || duckOthers // setCategory:AVAudioSessionCategoryPlayback withOptions:mixWithOthers || duckOthers
// Failed to set category, error: 'what' Error Domain=NSOSStatusErrorDomain // Failed to set category, error: 'what' Error Domain=NSOSStatusErrorDomain
@ -225,6 +226,7 @@ enum RCTPlayerOperations {
debugPrint("[RCTPlayerOperations] Reseting AVAudioSession category and options problem. Error: \(error).") debugPrint("[RCTPlayerOperations] Reseting AVAudioSession category and options problem. Error: \(error).")
} }
} }
#endif
} }
} else if let category = category, options == nil { } else if let category = category, options == nil {
do { do {

2
ios/Video/RCTVideo.swift
View File

@ -577,7 +577,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
_player?.isMuted = false _player?.isMuted = false
} }
if #available(iOS 12.0, *) { if #available(iOS 12.0, tvOS 12.0, *) {
_player?.preventsDisplaySleepDuringVideoPlayback = _preventsDisplaySleepDuringVideoPlayback _player?.preventsDisplaySleepDuringVideoPlayback = _preventsDisplaySleepDuringVideoPlayback
} else { } else {
// Fallback on earlier versions // Fallback on earlier versions

2
ios/Video/RCTVideoPlayerViewController.swift
View File

@ -24,7 +24,7 @@ class RCTVideoPlayerViewController: AVPlayerViewController {
rctDelegate?.videoPlayerViewControllerDidDismiss(playerViewController: self) rctDelegate?.videoPlayerViewControllerDidDismiss(playerViewController: self)
} }
#if !TARGET_OS_TV #if !os(tvOS)
func supportedInterfaceOrientations() -> UIInterfaceOrientationMask { func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
return .all return .all

2
react-native-video.podspec
View File

@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/react-native-video/react-native-video.git", :tag => "v#{s.version}" } s.source = { :git => "https://github.com/react-native-video/react-native-video.git", :tag => "v#{s.version}" }
s.ios.deployment_target = "9.0" s.ios.deployment_target = "9.0"
s.tvos.deployment_target = "9.0" s.tvos.deployment_target = "10.0"
s.subspec "Video" do |ss| s.subspec "Video" do |ss|
ss.source_files = "ios/Video/**/*.{h,m,swift}" ss.source_files = "ios/Video/**/*.{h,m,swift}"