diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb0cd056..1985ebe0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Long press gesture to play videos at 2x speed ([#666]) +### Changed +- Player now respects play/pause state when seeking + ### Fixed - Fixed opening JXL files from other apps ([#568]) diff --git a/app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt b/app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt index 653c422e6..1e42e919f 100644 --- a/app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt +++ b/app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt @@ -688,9 +688,6 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi if (forward) curr + FAST_FORWARD_VIDEO_MS else curr - FAST_FORWARD_VIDEO_MS newPosition = newPosition.coerceIn(0, mExoPlayer!!.duration) setPosition(newPosition) - if (!mIsPlaying) { - togglePlayPause() - } } private fun handleEvent(event: MotionEvent) { @@ -758,7 +755,7 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi } if (!mIsPlaying) { - togglePlayPause() + mPlayWhenReadyHandler.removeCallbacksAndMessages(null) } } mIsDragged = false @@ -816,7 +813,7 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi if (mIsPlaying) { mExoPlayer!!.playWhenReady = true } else { - togglePlayPause() + mPlayWhenReadyHandler.removeCallbacksAndMessages(null) } mIsDragged = false diff --git a/app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt index c8d28df12..45322ad5f 100644 --- a/app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt @@ -723,9 +723,6 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, if (forward) curr + FAST_FORWARD_VIDEO_MS else curr - FAST_FORWARD_VIDEO_MS newPosition = newPosition.coerceIn(0, maxOf(mExoPlayer!!.duration, 0)) setPosition(newPosition) - if (!mIsPlaying) { - togglePlayPause() - } } override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { @@ -766,8 +763,6 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, if (mIsPlaying) { mExoPlayer!!.playWhenReady = true - } else { - playVideo() } mIsDragged = false