Skip to content
Snippets Groups Projects
Commit d3f643e0 authored by Sébastien Toque's avatar Sébastien Toque
Browse files

fix video player hud timeout on TV

parent 6203663d
No related branches found
No related tags found
1 merge request!1198fix video player hud timeout on TV
......@@ -939,7 +939,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
return false
}
if (isShowing || fov == 0f && keyCode == KeyEvent.KEYCODE_DPAD_DOWN && !overlayDelegate.playlistContainer.isVisible())
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
when (keyCode) {
KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
touchDelegate.seekDelta(Settings.videoDoubleTapJumpDelay * 1000)
......@@ -989,7 +989,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
if (isNavMenu)
return navigateDvdMenu(keyCode)
else if (isLocked) {
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
} else if (!isShowing && !overlayDelegate.playlistContainer.isVisible()) {
if (event.isAltPressed && event.isCtrlPressed) {
touchDelegate.seekDelta(-300000)
......@@ -1010,7 +1010,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
if (isNavMenu)
return navigateDvdMenu(keyCode)
else if (isLocked) {
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
} else if (!isShowing && !overlayDelegate.playlistContainer.isVisible()) {
if (event.isAltPressed && event.isCtrlPressed) {
touchDelegate.seekDelta(300000)
......@@ -1031,7 +1031,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
if (isNavMenu)
return navigateDvdMenu(keyCode)
else if (isLocked) {
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
} else if (event.isCtrlPressed) {
volumeUp()
return true
......@@ -1047,7 +1047,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
if (isNavMenu)
return navigateDvdMenu(keyCode)
else if (isLocked) {
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
} else if (event.isCtrlPressed) {
volumeDown()
return true
......@@ -1060,7 +1060,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
if (isNavMenu)
return navigateDvdMenu(keyCode)
else if (isLocked) {
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay)
overlayDelegate.showOverlayTimeout(Settings.videoHudDelay * 1000)
} else if (!isShowing) {
doPlayPause()
return true
......@@ -1396,7 +1396,7 @@ open class VideoPlayerActivity : AppCompatActivity(), PlaybackService.Callback,
overlayDelegate.updateOverlayPausePlay()
updateNavStatus()
if (!mw.hasFlag(MediaWrapper.MEDIA_PAUSED))
handler.sendEmptyMessageDelayed(FADE_OUT, Settings.videoHudDelay.toLong())
handler.sendEmptyMessageDelayed(FADE_OUT, Settings.videoHudDelay.toLong() * 1000)
else {
mw.removeFlags(MediaWrapper.MEDIA_PAUSED)
wasPaused = false
......
......@@ -391,7 +391,7 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
hudBinding.abRepeatMarkerA.visibility = if (abvalues.start == -1L) View.GONE else View.VISIBLE
hudBinding.abRepeatMarkerB.visibility = if (abvalues.stop == -1L) View.GONE else View.VISIBLE
service.manageAbRepeatStep(hudBinding.abRepeatReset, hudBinding.abRepeatStop, hudBinding.abRepeatContainer, abRepeatAddMarker)
if (player.settings.getBoolean(VIDEO_TRANSITION_SHOW, true)) showOverlayTimeout(if (abvalues.start == -1L || abvalues.stop == -1L) VideoPlayerActivity.OVERLAY_INFINITE else Settings.videoHudDelay)
if (player.settings.getBoolean(VIDEO_TRANSITION_SHOW, true)) showOverlayTimeout(if (abvalues.start == -1L || abvalues.stop == -1L) VideoPlayerActivity.OVERLAY_INFINITE else Settings.videoHudDelay * 1000)
})
service.playlistManager.abRepeatOn.observe(player, {
abRepeatAddMarker.visibility = if (it) View.VISIBLE else View.GONE
......@@ -472,7 +472,7 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
hudBinding.orientationToggle.setOnClickListener(if (enabled) player else null)
hudBinding.orientationToggle.setOnLongClickListener(if (enabled) player else null)
hudBinding.swipeToUnlock.setOnStartTouchingListener { showOverlayTimeout(VideoPlayerActivity.OVERLAY_INFINITE) }
hudBinding.swipeToUnlock.setOnStopTouchingListener { showOverlayTimeout(Settings.videoHudDelay) }
hudBinding.swipeToUnlock.setOnStopTouchingListener { showOverlayTimeout(Settings.videoHudDelay * 1000) }
hudBinding.swipeToUnlock.setOnUnlockListener { player.toggleLock() }
}
if (::hudRightBinding.isInitialized){
......@@ -808,7 +808,7 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
bookmarkListDelegate.markerContainer = hudBinding.bookmarkMarkerContainer
bookmarkListDelegate.visibilityListener = {
if (bookmarkListDelegate.visible) showOverlayTimeout(VideoPlayerActivity.OVERLAY_INFINITE)
else showOverlayTimeout(Settings.videoHudDelay)
else showOverlayTimeout(Settings.videoHudDelay * 1000)
}
}
bookmarkListDelegate.show()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment