PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

release the mediaplayer if something goes wrong at init

Browse source
This commit is contained in:
tibbi 2017-06-18 19:08:53 +02:00
parent 99f14bfee1
commit 47ec461139
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
View file

@ -229,6 +229,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
} }
} catch (e: IOException) { } catch (e: IOException) {
Log.e(TAG, "init media player failed $e") Log.e(TAG, "init media player failed $e")
releaseMediaPlayer()
} }
} }
@ -259,12 +260,16 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
private fun cleanup() { private fun cleanup() {
pauseVideo() pauseVideo()
mCurrTimeView?.text = 0.getFormattedDuration() mCurrTimeView?.text = 0.getFormattedDuration()
mMediaPlayer?.release() releaseMediaPlayer()
mMediaPlayer = null
mSeekBar?.progress = 0 mSeekBar?.progress = 0
mTimerHandler?.removeCallbacksAndMessages(null) mTimerHandler?.removeCallbacksAndMessages(null)
} }
private fun releaseMediaPlayer() {
mMediaPlayer?.release()
mMediaPlayer = null
}
private fun videoPrepared(mediaPlayer: MediaPlayer) { private fun videoPrepared(mediaPlayer: MediaPlayer) {
mDuration = mediaPlayer.duration / 1000 mDuration = mediaPlayer.duration / 1000
addPreviewImage() addPreviewImage()
@ -295,8 +300,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
} }
override fun surfaceDestroyed(holder: SurfaceHolder) { override fun surfaceDestroyed(holder: SurfaceHolder) {
mMediaPlayer?.release() releaseMediaPlayer()
mMediaPlayer = null
} }
private fun setVideoSize() { private fun setVideoSize() {