mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-25 06:11:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat(player): Add Web Video Caster to external player preference (#1158)

Browse source
This commit is contained in:
Secozzi 2023-10-16 10:40:03 +00:00 committed by GitHub
parent 19b543d979
commit 9e2244c0e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
View file

@ -34,6 +34,7 @@ import eu.kanade.tachiyomi.ui.player.MX_PLAYER_FREE
import eu.kanade.tachiyomi.ui.player.MX_PLAYER_PRO
import eu.kanade.tachiyomi.ui.player.NEXT_PLAYER
import eu.kanade.tachiyomi.ui.player.VLC_PLAYER
import eu.kanade.tachiyomi.ui.player.WEB_VIDEO_CASTER
import eu.kanade.tachiyomi.ui.player.X_PLAYER
import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences
import tachiyomi.presentation.core.components.WheelTextPicker
@ -395,4 +396,5 @@ val externalPlayers = listOf(
JUST_PLAYER,
NEXT_PLAYER,
X_PLAYER,
WEB_VIDEO_CASTER,
)

45
app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt
View file

@ -7,6 +7,7 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import androidx.core.content.FileProvider
import androidx.core.net.toUri
import eu.kanade.core.util.asFlow
@ -23,6 +24,7 @@ import eu.kanade.tachiyomi.data.track.AnimeTrackService
import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.ui.player.loader.EpisodeLoader
import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences
import eu.kanade.tachiyomi.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.system.isOnline
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.DelicateCoroutinesApi
@ -88,7 +90,7 @@ class ExternalIntents {
addVideoHeaders(false, video, this)
}
} else {
standardIntentForPackage(pkgName, context, videoUrl, video)
getIntentForPackage(pkgName, context, videoUrl, video)
}
}
@ -153,6 +155,46 @@ class ExternalIntents {
withUIContext { context.toast(e?.message ?: "Cannot open episode") }
}
/**
* Returns the [Intent] with added data to send to the given external player.
*
* @param pkgName the name of the package to send the [Intent] to.
* @param context the application context.
* @param uri the path data of the video.
* @param video the video being sent to the external player.
*/
private fun getIntentForPackage(pkgName: String, context: Context, uri: Uri, video: Video): Intent {
return when (pkgName) {
WEB_VIDEO_CASTER -> webVideoCasterIntent(pkgName, context, uri, video)
else -> standardIntentForPackage(pkgName, context, uri, video)
}
}
private fun webVideoCasterIntent(pkgName: String, context: Context, uri: Uri, video: Video): Intent {
return Intent(Intent.ACTION_VIEW).apply {
setDataAndType(uri, "video/*")
if (isPackageInstalled(pkgName, context.packageManager)) setPackage(WEB_VIDEO_CASTER)
addExtrasAndFlags(true, this)
val headers = Bundle()
video.headers?.forEach {
headers.putString(it.first, it.second)
}
val localLangName = LocaleHelper.getSimpleLocaleDisplayName()
video.subtitleTracks.firstOrNull {
it.lang.contains(localLangName)
}?.let {
putExtra("subtitle", it.url)
} ?: video.subtitleTracks.firstOrNull()?.let {
putExtra("subtitle", it.url)
}
putExtra("android.media.intent.extra.HTTP_HEADERS", headers)
putExtra("secure_uri", true)
}
}
/**
* Returns the [Intent] with added data to send to the given external player.
*
@ -507,3 +549,4 @@ const val MPV_REMOTE = "com.husudosu.mpvremote"
const val JUST_PLAYER = "com.brouken.player"
const val NEXT_PLAYER = "dev.anilbeesetti.nextplayer"
const val X_PLAYER = "video.player.videoplayer"
const val WEB_VIDEO_CASTER = "com.instantbits.cast.webvideo"