From 158fbb106464ff41410eb1f1d1f5ff9914a075ab Mon Sep 17 00:00:00 2001
From: jhays <orbosphere@gmail.com>
Date: Tue, 3 May 2022 22:30:43 -0500
Subject: [PATCH] fix merge

---
 .../VideoPlayer/LiveTVPlayerViewController.swift   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Swiftfin/Views/VideoPlayer/LiveTVPlayerViewController.swift b/Swiftfin/Views/VideoPlayer/LiveTVPlayerViewController.swift
index 93d4cef6..21348eb0 100644
--- a/Swiftfin/Views/VideoPlayer/LiveTVPlayerViewController.swift
+++ b/Swiftfin/Views/VideoPlayer/LiveTVPlayerViewController.swift
@@ -242,7 +242,7 @@ class LiveTVPlayerViewController: UIViewController {
 
 	@objc
 	private func didTap() {
-		didGenerallyTap()
+        didGenerallyTap(point: nil)
 	}
 
 	@objc
@@ -500,11 +500,11 @@ extension LiveTVPlayerViewController {
 		viewModel = newViewModel
 
 		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] {
-			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 {
-			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,11 +904,15 @@ extension LiveTVPlayerViewController: PlayerOverlayDelegate {
 		}
 	}
 
-	func didGenerallyTap() {
+    func didGenerallyTap(point: CGPoint?) {
 		toggleOverlay()
 
 		restartOverlayDismissTimer(interval: 5)
 	}
+    
+    func didLongPress() {
+        
+    }
 
 	func didBeginScrubbing() {
 		stopOverlayDismissTimer()