[Android] PlayerController: sanity check
Geoffrey Métais
git at videolan.org
Thu Mar 14 11:13:56 CET 2019
vlc-android | branch: 3.1.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Mar 14 10:28:18 2019 +0100| [799e8af2ea0bcac1d9238b8dea775cdea803d65b] | committer: Geoffrey Métais
PlayerController: sanity check
(cherry picked from commit 36ad23ddfa3e2b32a30e3b051147e971e265e2de)
> https://code.videolan.org/videolan/vlc-android/commit/799e8af2ea0bcac1d9238b8dea775cdea803d65b
---
.../src/org/videolan/vlc/media/PlayerController.kt | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/media/PlayerController.kt b/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
index 506a66c5f..5044d41a0 100644
--- a/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
+++ b/vlc-android/src/org/videolan/vlc/media/PlayerController.kt
@@ -121,27 +121,27 @@ class PlayerController(val context: Context) : IVLCVout.Callback, MediaPlayer.Ev
fun getVideoTracksCount() = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.videoTracksCount else 0
- fun getVideoTracks(): Array<out MediaPlayer.TrackDescription>? = mediaplayer.videoTracks
+ fun getVideoTracks(): Array<out MediaPlayer.TrackDescription>? = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.videoTracks else emptyArray()
- fun getVideoTrack() = mediaplayer.videoTrack
+ fun getVideoTrack() = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.videoTrack else -1
- fun getCurrentVideoTrack(): Media.VideoTrack? = mediaplayer.currentVideoTrack
+ fun getCurrentVideoTrack(): Media.VideoTrack? = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.currentVideoTrack else null
fun getAudioTracksCount() = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.audioTracksCount else 0
- fun getAudioTracks(): Array<out MediaPlayer.TrackDescription>? = mediaplayer.audioTracks
+ fun getAudioTracks(): Array<out MediaPlayer.TrackDescription>? = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.audioTracks else emptyArray()
- fun getAudioTrack() = mediaplayer.audioTrack
+ fun getAudioTrack() = if (!mediaplayer.isReleased && mediaplayer.hasMedia()) mediaplayer.audioTrack else -1
- fun setVideoTrack(index: Int) = mediaplayer.setVideoTrack(index)
+ fun setVideoTrack(index: Int) = !mediaplayer.isReleased && mediaplayer.hasMedia() && mediaplayer.setVideoTrack(index)
- fun setAudioTrack(index: Int) = mediaplayer.setAudioTrack(index)
+ fun setAudioTrack(index: Int) = !mediaplayer.isReleased && mediaplayer.hasMedia() && mediaplayer.setAudioTrack(index)
- fun setAudioDigitalOutputEnabled(enabled: Boolean) = mediaplayer.setAudioDigitalOutputEnabled(enabled)
+ fun setAudioDigitalOutputEnabled(enabled: Boolean) = !mediaplayer.isReleased && mediaplayer.setAudioDigitalOutputEnabled(enabled)
- fun getAudioDelay() = mediaplayer.audioDelay
+ fun getAudioDelay() = if (mediaplayer.hasMedia() && !mediaplayer.isReleased) mediaplayer.audioDelay else 0L
- fun getSpuDelay() = mediaplayer.spuDelay
+ fun getSpuDelay() = if (mediaplayer.hasMedia() && !mediaplayer.isReleased) mediaplayer.spuDelay else 0L
fun getRate() = if (mediaplayer.hasMedia() && !mediaplayer.isReleased && playbackState != PlaybackStateCompat.STATE_STOPPED) mediaplayer.rate else 1.0f
@@ -258,19 +258,19 @@ class PlayerController(val context: Context) : IVLCVout.Callback, MediaPlayer.Ev
fun getTitles(): Array<out MediaPlayer.Title>? = if (!mediaplayer.isReleased) mediaplayer.titles else emptyArray()
- fun getChapterIdx() = mediaplayer.chapter
+ fun getChapterIdx() = if (!mediaplayer.isReleased) mediaplayer.chapter else -1
fun setChapterIdx(chapter: Int) {
- mediaplayer.chapter = chapter
+ if (!mediaplayer.isReleased) mediaplayer.chapter = chapter
}
- fun getTitleIdx() = mediaplayer.title
+ fun getTitleIdx() = if (!mediaplayer.isReleased) mediaplayer.title else -1
fun setTitleIdx(title: Int) {
- mediaplayer.title = title
+ if (!mediaplayer.isReleased) mediaplayer.title = title
}
- fun getVolume() = if (mediaplayer.hasMedia()) mediaplayer.volume else 100
+ fun getVolume() = if (!mediaplayer.isReleased) mediaplayer.volume else 100
fun setVolume(volume: Int) = if (!mediaplayer.isReleased) mediaplayer.setVolume(volume) else -1
More information about the Android
mailing list