Skip to content

Commit 1d1cbe4

Browse files
authored
feat: disable auto-play on seek (#768)
* feat: disable auto-play on seek This keeps the behavior consistent with Music Player (see FossifyOrg/Music-Player#97) * docs: update changelog # Conflicts: # CHANGELOG.md * fix: handle skipping * fix: clear scheduled callback after seeking
1 parent 07125ee commit 1d1cbe4

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
### Added
99
- Long press gesture to play videos at 2x speed ([#666])
1010

11+
### Changed
12+
- Player now respects play/pause state when seeking
13+
1114
### Fixed
1215
- Fixed opening JXL files from other apps ([#568])
1316

app/src/main/kotlin/org/fossify/gallery/activities/VideoPlayerActivity.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,6 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi
688688
if (forward) curr + FAST_FORWARD_VIDEO_MS else curr - FAST_FORWARD_VIDEO_MS
689689
newPosition = newPosition.coerceIn(0, mExoPlayer!!.duration)
690690
setPosition(newPosition)
691-
if (!mIsPlaying) {
692-
togglePlayPause()
693-
}
694691
}
695692

696693
private fun handleEvent(event: MotionEvent) {
@@ -758,7 +755,7 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi
758755
}
759756

760757
if (!mIsPlaying) {
761-
togglePlayPause()
758+
mPlayWhenReadyHandler.removeCallbacksAndMessages(null)
762759
}
763760
}
764761
mIsDragged = false
@@ -816,7 +813,7 @@ open class VideoPlayerActivity : BaseViewerActivity(), SeekBar.OnSeekBarChangeLi
816813
if (mIsPlaying) {
817814
mExoPlayer!!.playWhenReady = true
818815
} else {
819-
togglePlayPause()
816+
mPlayWhenReadyHandler.removeCallbacksAndMessages(null)
820817
}
821818

822819
mIsDragged = false

app/src/main/kotlin/org/fossify/gallery/fragments/VideoFragment.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,9 +723,6 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener,
723723
if (forward) curr + FAST_FORWARD_VIDEO_MS else curr - FAST_FORWARD_VIDEO_MS
724724
newPosition = newPosition.coerceIn(0, maxOf(mExoPlayer!!.duration, 0))
725725
setPosition(newPosition)
726-
if (!mIsPlaying) {
727-
togglePlayPause()
728-
}
729726
}
730727

731728
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
@@ -766,8 +763,6 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener,
766763

767764
if (mIsPlaying) {
768765
mExoPlayer!!.playWhenReady = true
769-
} else {
770-
playVideo()
771766
}
772767

773768
mIsDragged = false

0 commit comments

Comments
 (0)