Skip to content

Deinit now playing window #3943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 2 commits into from
Jan 12, 2026
Merged

Deinit now playing window #3943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e68c039
Deinit now playing info
mpivchev Jan 5, 2026
bf8aa48
Refactor
mpivchev Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,12 @@ extension NCPlayer: VLCMediaPlayerDelegate {

switch player.state {
case .stopped:
playerToolBar?.playButtonPlay()
playerToolBar?.showPlayButton()

NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterPlayerStoppedPlaying)

print("Player mode: STOPPED")
case .opening:
playerToolBar?.playbackSliderEvent = .began
print("Player mode: OPENING")
case .buffering:
print("Player mode: BUFFERING")
Expand All @@ -229,7 +228,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
self.restartAVPlayer(position: 0, pauseAfterPlay: !playRepeat)
}
}
playerToolBar?.playButtonPlay()
playerToolBar?.showPlayButton()
print("Player mode: ENDED")
case .error:
print("Player mode: ERROR")
Expand All @@ -244,7 +243,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
pauseAfterPlay = false
self.viewerMediaPage?.updateCommandCenter(ncplayer: self, title: metadata.fileNameView)
} else {
playerToolBar.playButtonPause()
playerToolBar.showPauseButton()
// Set track audio/subtitle
let data = self.database.getVideo(metadata: metadata)
if let currentAudioTrackIndex = data?.currentAudioTrackIndex {
Expand All @@ -270,7 +269,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
case .paused:
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterPlayerStoppedPlaying)

playerToolBar?.playButtonPlay()
playerToolBar?.showPlayButton()
print("Player mode: PAUSED")
default: break
}
Expand Down
8 changes: 5 additions & 3 deletions iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayerToolBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ class NCPlayerToolBar: UIView {
@IBOutlet weak var repeatButton: UIButton!

enum sliderEventType {
case none
case began
case ended
case moved
}
var playbackSliderEvent: sliderEventType = .ended

var playbackSliderEvent: sliderEventType = .none
var isFullscreen: Bool = false
var playRepeat: Bool = false

Expand Down Expand Up @@ -196,13 +198,13 @@ class NCPlayerToolBar: UIView {
})
}

func playButtonPause() {
func showPauseButton() {
buttonImage = UIImage(systemName: "pause.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: pointSize))!.withTintColor(.white, renderingMode: .alwaysOriginal)
playButton.setImage(buttonImage, for: .normal)
MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 1
}

func playButtonPlay() {
func showPlayButton() {
buttonImage = UIImage(systemName: "play.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: pointSize))!.withTintColor(.white, renderingMode: .alwaysOriginal)
playButton.setImage(buttonImage, for: .normal)
MPNowPlayingInfoCenter.default().nowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = 0
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ class NCViewerMediaPage: UIViewController {
func clearCommandCenter() {

UIApplication.shared.endReceivingRemoteControlEvents()
MPNowPlayingInfoCenter.default().nowPlayingInfo = [:]
MPNowPlayingInfoCenter.default().nowPlayingInfo = nil

MPRemoteCommandCenter.shared().playCommand.isEnabled = false
MPRemoteCommandCenter.shared().pauseCommand.isEnabled = false
Expand Down