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

fix merge

This commit is contained in:
jhays 2022-05-03 22:30:43 -05:00
parent 7833280175
commit 158fbb1064
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Swiftfin/Views/VideoPlayer/LiveTVPlayerViewController.swift
View File

@ -242,7 +242,7 @@ class LiveTVPlayerViewController: UIViewController {
@objc @objc
private func didTap() { private func didTap() {
didGenerallyTap() didGenerallyTap(point: nil)
} }
@objc @objc
@ -500,11 +500,11 @@ extension LiveTVPlayerViewController {
viewModel = newViewModel viewModel = newViewModel
if viewModel.streamType == .direct { if viewModel.streamType == .direct {
LogManager.shared.log.debug("Player set up with direct play stream for item: \(viewModel.item.id ?? "--")") LogManager.log.debug("Player set up with direct play stream for item: \(viewModel.item.id ?? "--")")
} else if viewModel.streamType == .transcode && Defaults[.Experimental.forceDirectPlay] { } else if viewModel.streamType == .transcode && Defaults[.Experimental.forceDirectPlay] {
LogManager.shared.log.debug("Player set up with forced direct stream for item: \(viewModel.item.id ?? "--")") LogManager.log.debug("Player set up with forced direct stream for item: \(viewModel.item.id ?? "--")")
} else { } else {
LogManager.shared.log.debug("Player set up with transcoded stream for item: \(viewModel.item.id ?? "--")") LogManager.log.debug("Player set up with transcoded stream for item: \(viewModel.item.id ?? "--")")
} }
} }
@ -904,12 +904,16 @@ extension LiveTVPlayerViewController: PlayerOverlayDelegate {
} }
} }
func didGenerallyTap() { func didGenerallyTap(point: CGPoint?) {
toggleOverlay() toggleOverlay()
restartOverlayDismissTimer(interval: 5) restartOverlayDismissTimer(interval: 5)
} }
func didLongPress() {
}
func didBeginScrubbing() { func didBeginScrubbing() {
stopOverlayDismissTimer() stopOverlayDismissTimer()
} }