jellyfin/jellyfin-android
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-android.git synced 2026-09-03 05:10:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from CarlosOlivo/external-subtitles

Browse Source 
Add support for external subtitles in some external players
This commit is contained in:
Max Rumpf
2020-10-08 23:07:37 +02:00
committed by GitHub
parent 37448d4550 065ea6875f
commit 2d2b5e1b4c
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/jellyfin/mobile/bridge/ExternalPlayer.kt
+17 -10
View File
@@ -3,6 +3,7 @@ package org.jellyfin.mobile.bridge
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.webkit.JavascriptInterface
import android.widget.Toast
import org.jellyfin.mobile.AppPreferences
@@ -25,8 +26,6 @@ class ExternalPlayer(private val fragment: WebViewFragment) : KoinComponent {
private val appPreferences: AppPreferences by inject()
private val webappFunctionChannel: WebappFunctionChannel by inject()
private var mediaSource: JellyfinMediaSource? = null
private var playerIntent: Intent? = null
@JavascriptInterface
fun isEnabled() = appPreferences.videoPlayerType == VideoPlayerType.EXTERNAL_PLAYER
@@ -34,19 +33,27 @@ class ExternalPlayer(private val fragment: WebViewFragment) : KoinComponent {
@JavascriptInterface
fun initPlayer(args: String) {
try {
mediaSource = JellyfinMediaSource(JSONObject(args))
if (mediaSource?.playMethod.equals("DirectStream")) {
playerIntent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(mediaSource?.uri, mediaSource?.mimeType)
putExtra("title", mediaSource?.title)
putExtra("position", mediaSource?.mediaStartMs)
val mediaSource = JellyfinMediaSource(JSONObject(args))
if (mediaSource.playMethod == "DirectStream") {
val playerIntent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(mediaSource.uri, mediaSource.mimeType)
putExtra("title", mediaSource.title)
putExtra("position", mediaSource.mediaStartMs)
putExtra("return_result", true)
putExtra("secure_uri", true)
val selectedTrack = mediaSource.subtitleTracksGroup.tracks.getOrNull(mediaSource.subtitleTracksGroup.selectedTrack)?.url
if (selectedTrack != null) {
val externalTracks = mediaSource.subtitleTracksGroup.tracks.filter { !it.embedded && it.url != null }
putExtra("subs", externalTracks.map { Uri.parse(it.url) }.toTypedArray())
putExtra("subs.name", externalTracks.map { it.language }.toTypedArray())
putExtra("subs.filename", externalTracks.map { it.title }.toTypedArray())
putExtra("subs.enable", arrayOf(Uri.parse(selectedTrack)))
}
}
fragment.startActivityForResult(playerIntent, Constants.HANDLE_EXTERNAL_PLAYER)
Timber.d("Starting playback [id: ${mediaSource?.id}, title: ${mediaSource?.title}, playMethod: ${mediaSource?.playMethod}, mediaStartMs: ${mediaSource?.mediaStartMs}]")
Timber.d("Starting playback [id: ${mediaSource.id}, title: ${mediaSource.title}, playMethod: ${mediaSource.playMethod}, mediaStartMs: ${mediaSource.mediaStartMs}]")
} else {
Timber.d("Play Method '${mediaSource?.playMethod}' not tested, ignoring...")
Timber.d("Play Method '${mediaSource.playMethod}' not tested, ignoring...")
notifyEvent(Constants.EVENT_CANCELED)
context.toast(R.string.external_player_invalid_play_method, Toast.LENGTH_LONG)
}