From d5e225dce1fa9f81be898383b4a872f715c2621b Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Thu, 30 Dec 2021 13:54:24 -0700 Subject: [PATCH] remove VLC screen filled --- .../VLCPlayerCompactOverlayView.swift | 12 ---------- .../VideoPlayer/VLCPlayerViewController.swift | 22 ------------------- Shared/ViewModels/VideoPlayerViewModel.swift | 1 - 3 files changed, 35 deletions(-) diff --git a/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift b/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift index e2ddc63d..544af8df 100644 --- a/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift +++ b/JellyfinPlayer/Views/VideoPlayer/Overlays/VLCPlayerCompactOverlayView.swift @@ -103,18 +103,6 @@ struct VLCPlayerCompactOverlayView: View, VideoPlayerOverlay { } } - // Button { - // viewModel.screenFilled = !viewModel.screenFilled - // } label: { - // if viewModel.screenFilled { - // Image(systemName: "rectangle.arrowtriangle.2.inward") - // .rotationEffect(Angle(degrees: 90)) - // } else { - // Image(systemName: "rectangle.arrowtriangle.2.outward") - // .rotationEffect(Angle(degrees: 90)) - // } - // } - if !viewModel.subtitleStreams.isEmpty { Button { viewModel.playerOverlayDelegate?.didSelectCaptions() diff --git a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift index d2648ca6..4f2cada4 100644 --- a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerViewController.swift @@ -134,24 +134,6 @@ class VLCPlayerViewController: UIViewController { viewModel.sendPauseReport(paused: true) } - private func changeFill(to shouldFill: Bool) { - if shouldFill { - // TODO: May not be possible with current VLCKit - -// let drawableView = vlcMediaPlayer.drawable as! UIView -// let drawableViewSize = drawableView.frame.size -// let mediaSize = vlcMediaPlayer.videoSize - - // Largest size from mediaSize is how it is currently filled - // in the drawable view, find scaleFactor by filling entire - // drawableView - - vlcMediaPlayer.scaleFactor = 1.5 - } else { - vlcMediaPlayer.scaleFactor = 0 - } - } - override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) @@ -309,10 +291,6 @@ extension VLCPlayerViewController { self.vlcMediaPlayer.rate = Float(newSpeed.rawValue) }.store(in: &viewModelReactCancellables) - viewModel.$screenFilled.sink { shouldFill in - self.changeFill(to: shouldFill) - }.store(in: &viewModelReactCancellables) - viewModel.$sliderIsScrubbing.sink { sliderIsScrubbing in if sliderIsScrubbing { self.didBeginScrubbing() diff --git a/Shared/ViewModels/VideoPlayerViewModel.swift b/Shared/ViewModels/VideoPlayerViewModel.swift index 961abff2..45a1956d 100644 --- a/Shared/ViewModels/VideoPlayerViewModel.swift +++ b/Shared/ViewModels/VideoPlayerViewModel.swift @@ -34,7 +34,6 @@ final class VideoPlayerViewModel: ViewModel { @Published var leftLabelText: String = "--:--" @Published var rightLabelText: String = "--:--" @Published var playbackSpeed: PlaybackSpeed = .one - @Published var screenFilled: Bool = false @Published var sliderPercentage: Double { willSet { sliderScrubbingSubject.send(self)