Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Intent behavior of PlayerActivity #181

Merged
merged 3 commits into from
Dec 21, 2024
Merged

Improve Intent behavior of PlayerActivity #181

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f4db14
fix: improve Intent behavior of PlayerActivity
s12f Dec 20, 2024
8ec7edc
fix: action value
s12f Dec 20, 2024
54144f9
fix: update action value
s12f Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ class PlayerActivity : AppCompatActivity() {
setupAudio()
setupMediaSession()
getPlayableUri(intent)?.let(player::playFile)
setIntentExtras(intent.extras)
setOrientation()

binding.controls.setContent {
Expand Down Expand Up @@ -390,6 +389,20 @@ class PlayerActivity : AppCompatActivity() {
}
player.timePos = extras.getInt("position", 0) / 1000

// subtitles
if (extras.containsKey("subs")) {
val subList = Utils.getParcelableArray<Uri>(extras, "subs")
val subsToEnable = Utils.getParcelableArray<Uri>(extras, "subs.enable")

for (suburi in subList) {
val subfile = suburi.resolveUri(this) ?: continue
val flag = if (subsToEnable.any { it == suburi }) "select" else "auto"

Log.v(TAG, "Adding subtitles from intent extras: $subfile")
MPVLib.command(arrayOf("sub-add", subfile, flag))
}
}

extras.getStringArray("headers")?.let { headers ->
if (headers[0].startsWith("User-Agent", true)) MPVLib.setPropertyString("user-agent", headers[1])
val headersString = headers.asSequence().drop(2).chunked(2).associate { it[0] to it[1] }
Expand Down Expand Up @@ -527,6 +540,7 @@ class PlayerActivity : AppCompatActivity() {
when (eventId) {
MPVLib.mpvEventId.MPV_EVENT_FILE_LOADED -> {
fileName = getFileName(intent)
setIntentExtras(intent.extras)
viewModel.mediaTitle.update {
val mediaTitle = MPVLib.getPropertyString("media-title")
if (mediaTitle.isBlank() || mediaTitle.isDigitsOnly()) fileName else mediaTitle
Expand Down Expand Up @@ -597,7 +611,7 @@ class PlayerActivity : AppCompatActivity() {
Log.d(TAG, "setting return intent")
setResult(
RESULT_OK,
Intent().apply {
Intent(RESULT_INTENT).apply {
player.timePos?.let { putExtra("position", it * 1000) }
player.duration?.let { putExtra("duration", it * 1000) }
},
Expand Down Expand Up @@ -817,6 +831,11 @@ class PlayerActivity : AppCompatActivity() {
registerReceiver(noisyReceiver, filter)
noisyReceiver.initialized = true
}

companion object {
// action of result intent
private const val RESULT_INTENT = "live.mehiz.mpvkt.ui.player.PlayerActivity.result"
}
}

const val TAG = "mpvKt"