ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix nppbcntr & gestures.

This commit is contained in:
Aiden Vigue 2021-06-29 16:38:23 -04:00
parent 2b6f0c5ea1
commit f373a71e89
No known key found for this signature in database
GPG Key ID: B9A09843AB079D5B
4 changed files with 85 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift
View File

@ -110,14 +110,4 @@ class InfoTabBarViewController: UITabBarController, UIGestureRecognizerDelegate
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
return true
}
// MARK: - Navigation
// // In a storyboard-based application, you will often want to do a little preparation before navigation
// override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// // Get the new view controller using segue.destination.
// // Pass the selected object to the new view controller.
// }
//
}

1
JellyfinPlayer tvOS/VideoPlayer/MediaInfoView.swift
View File

@ -41,7 +41,6 @@ struct MediaInfoView: View {
var body: some View {
if let item = item {
HStack(spacing: 30) {
VStack {
ImageView(src: item.type == "Episode" ? item.getSeriesPrimaryImage(maxWidth: 200) : item.getPrimaryImage(maxWidth: 200), bh: item.type == "Episode" ? item.getSeriesPrimaryImageBlurHash() : item.getPrimaryImageBlurHash())
.frame(width: 200, height: 300)

113
JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift
View File

@ -49,8 +49,16 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
var lastTime: Float = 0.0
var startTime: Int = 0
var selectedAudioTrack: Int32 = -1
var selectedCaptionTrack: Int32 = -1
var selectedAudioTrack: Int32 = -1 {
didSet {
print(selectedAudioTrack)
}
}
var selectedCaptionTrack: Int32 = -1 {
didSet {
print(selectedCaptionTrack)
}
}
var subtitleTrackArray: [Subtitle] = []
var audioTrackArray: [AudioTrack] = []
@ -78,7 +86,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
// Check if focused on the tab bar, allows for swipe up to dismiss the info panel
if context.nextFocusedView!.description.contains("UITabBarButton") {
// Set value after half a second so info panel is not dismissed instantly when swiping up from content
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.focusedOnTabBar = true
}
} else {
@ -95,7 +103,6 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
mediaPlayer.delegate = self
mediaPlayer.drawable = videoContentView
mediaPlayer.libraryInstance.debugLogging = true;
if let runTimeTicks = manifest.runTimeTicks {
videoDuration = Double(runTimeTicks / 10_000_000)
@ -125,7 +132,9 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
transportBarView.layer.cornerRadius = CGFloat(5)
setupGestures()
fetchVideo()
setupNowPlayingCC()
// Adjust subtitle size
@ -296,13 +305,18 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
if let event = remoteEvent as? MPChangePlaybackPositionCommandEvent {
let targetSeconds = event.positionTime
print(targetSeconds)
let videoPosition = Double(self.mediaPlayer.time.intValue)
let videoPosition = Double(self.mediaPlayer.time.intValue / 1000)
print(videoPosition)
let offset = targetSeconds - videoPosition
print(offset)
if offset > 0 {
self.mediaPlayer.jumpForward(Int32(offset)/1000)
self.mediaPlayer.jumpForward(Int32(offset))
} else {
self.mediaPlayer.jumpBackward(Int32(abs(offset))/1000)
self.mediaPlayer.jumpBackward(Int32(abs(offset)))
}
self.sendProgressReport(eventName: "unpause")
@ -352,19 +366,18 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
if let playing = playing {
nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = playing ? 1.0 : 0.0
}
if let time = time {
nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = time
}
nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = mediaPlayer.time.intValue / 1000
MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
}
// Grabs a reference to the info panel view controller
// Grabs a refference to the info panel view controller
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "infoView" {
containerViewController = segue.destination as? InfoTabBarViewController
containerViewController?.videoPlayer = self
}
}
@ -386,7 +399,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
self.sendProgressReport(eventName: "pause")
self.updateNowPlayingCenter(time: nil, playing: false)
self.toggleInfoContainer()
animateScrubber()
self.scrubLabel.frame = CGRect(x: self.scrubberView.frame.minX - self.scrubLabel.frame.width/2, y: self.scrubLabel.frame.minY, width: self.scrubLabel.frame.width, height: self.scrubLabel.frame.height)
@ -397,8 +410,9 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
mediaPlayer.play()
self.updateNowPlayingCenter(time: nil, playing: true)
self.toggleInfoContainer()
self.sendProgressReport(eventName: "unpause")
animateScrubber()
}
@ -445,10 +459,19 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.userPanned(panGestureRecognizer:)))
view.addGestureRecognizer(panGestureRecognizer)
let swipeRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(self.swipe(swipe:)))
swipeRecognizer.direction = .right
view.addGestureRecognizer(swipeRecognizer)
let swipeRecognizerl = UISwipeGestureRecognizer(target: self, action: #selector(self.swipe(swipe:)))
swipeRecognizerl.direction = .left
view.addGestureRecognizer(swipeRecognizerl)
}
@objc func backButtonPressed(tap: UITapGestureRecognizer) {
print("back")
// Dismiss info panel
if showingInfoPanel {
if focusedOnTabBar {
@ -474,6 +497,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
}
@objc func userPanned(panGestureRecognizer: UIPanGestureRecognizer) {
print("pan")
if loading {
return
}
@ -482,7 +506,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
let velocity = panGestureRecognizer.velocity(in: view)
// Swiped up - Handle dismissing info panel
if translation.y < -400 && (focusedOnTabBar && showingInfoPanel) {
if translation.y < -700 && (focusedOnTabBar && showingInfoPanel) {
toggleInfoContainer()
return
}
@ -492,7 +516,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
}
// Swiped down - Show the info panel
if translation.y > 400 {
if translation.y > 700 {
toggleInfoContainer()
return
}
@ -522,13 +546,40 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
}
// Not currently used
@objc func swipe(swipe: UISwipeGestureRecognizer!) {
print("swiped")
switch swipe.direction {
case .left:
print("swiped left")
// mediaPlayer.pause()
// player.seek(to: CMTime(value: Int64(self.currentSeconds) + 10, timescale: 1))
// mediaPlayer.play()
case .right:
print("swiped right")
// mediaPlayer.pause()
// player.seek(to: CMTime(value: Int64(self.currentSeconds) + 10, timescale: 1))
// mediaPlayer.play()
case .up:
break
case .down:
break
default:
break
}
}
/// Play/Pause or Select is pressed on the AppleTV remote
@objc func selectButtonTapped() {
print("select")
if loading {
return
}
showingControls = true
controlsView.isHidden = false
controlsAppearTime = CACurrentMediaTime()
// Move to seeked position
if seeking {
scrubLabel.isHidden = true
@ -558,6 +609,8 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
// MARK: Jellyfin Playstate updates
func sendProgressReport(eventName: String) {
updateNowPlayingCenter(time: nil, playing: mediaPlayer.state == .playing)
if (eventName == "timeupdate" && mediaPlayer.state == .playing) || eventName != "timeupdate" {
let progressInfo = PlaybackProgressInfo(canSeek: true, item: manifest, itemId: manifest.id, sessionId: playSessionId, mediaSourceId: manifest.id, audioStreamIndex: Int(selectedAudioTrack), subtitleStreamIndex: Int(selectedCaptionTrack), isPaused: (!playing), isMuted: false, positionTicks: Int64(mediaPlayer.position * Float(manifest.runTimeTicks!)), playbackStartTimeTicks: Int64(startTime), volumeLevel: 100, brightness: 100, aspectRatio: nil, playMethod: playbackItem.videoType, liveStreamId: nil, playSessionId: playSessionId, repeatMode: .repeatNone, nowPlayingQueue: [], playlistItemId: "playlistItem0")
@ -655,8 +708,18 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
// Move time along transport bar
func mediaPlayerTimeChanged(_ aNotification: Notification!) {
if loading {
loading = false
DispatchQueue.main.async { [self] in
activityIndicator.isHidden = true
activityIndicator.stopAnimating()
}
updateNowPlayingCenter(time: nil, playing: true)
}
let time = mediaPlayer.position
if abs(time-lastTime) > 0.00005 {
if time != lastTime {
self.currentTimeLabel.text = formatSecondsToHMS(Double(mediaPlayer.time.intValue/1000))
self.remainingTimeLabel.text = "-" + formatSecondsToHMS(Double(abs(mediaPlayer.remainingTime.intValue/1000)))
@ -680,23 +743,15 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
controlsAppearTime = 999_999_999_999_999
}
}
lastTime = time
}
lastTime = time
if CACurrentMediaTime() - lastProgressReportTime > 5 {
mediaPlayer.currentVideoSubTitleIndex = selectedCaptionTrack
sendProgressReport(eventName: "timeupdate")
lastProgressReportTime = CACurrentMediaTime()
}
if loading {
loading = false
DispatchQueue.main.async { [self] in
activityIndicator.isHidden = true
activityIndicator.stopAnimating()
}
updateNowPlayingCenter(time: nil, playing: true)
}
}
// MARK: Settings Delegate

2
Shared/ViewModels/DetailItemViewModel.swift
View File

@ -28,7 +28,7 @@ class DetailItemViewModel: ViewModel {
}
func getRelatedItems() {
LibraryAPI.getSimilarItems(itemId: item.id!, userId: SessionManager.current.user.user_id!, fields: [.primaryImageAspectRatio, .seriesPrimaryImage, .seasonUserData, .overview, .genres, .people])
LibraryAPI.getSimilarItems(itemId: item.id!, userId: SessionManager.current.user.user_id!, limit: 20, fields: [.primaryImageAspectRatio, .seriesPrimaryImage, .seasonUserData, .overview, .genres, .people])
.trackActivity(loading)
.sink(receiveCompletion: { [weak self] completion in
self?.handleAPIRequestCompletion(completion: completion)