Apply TTS setting changes during playback
Build & Test / Build & Test App (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled

This commit is contained in:
BookOasis Reader
2026-09-26 21:31:28 +09:00
parent 8e113fcbff
commit 3a5a4c0fb2
3 changed files with 127 additions and 19 deletions
@@ -2,6 +2,8 @@ package eu.kanade.presentation.reader.settings
import android.content.Intent import android.content.Intent
import android.speech.tts.TextToSpeech import android.speech.tts.TextToSpeech
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChip
@@ -34,6 +36,14 @@ private val fontFamilies = listOf(
@Composable @Composable
internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) { internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
val context = LocalContext.current val context = LocalContext.current
val ttsSettingsLauncher = rememberLauncherForActivityResult(
ActivityResultContracts.StartActivityForResult(),
) {
ReaderTtsController.refreshVoiceSettings(
context,
viewModel.preferences.textTtsEnginePackage.get(),
)
}
val fontSizePref = viewModel.preferences.textFontSize val fontSizePref = viewModel.preferences.textFontSize
val fontSize by fontSizePref.collectAsState() val fontSize by fontSizePref.collectAsState()
@@ -130,18 +140,27 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
SettingsChipRow(MR.strings.pref_text_reader_tts_engine) { SettingsChipRow(MR.strings.pref_text_reader_tts_engine) {
FilterChip( FilterChip(
selected = selectedEngine == ReaderTtsService.AUTO_ENGINE, selected = selectedEngine == ReaderTtsService.AUTO_ENGINE,
onClick = { enginePref.set(ReaderTtsService.AUTO_ENGINE) }, onClick = {
enginePref.set(ReaderTtsService.AUTO_ENGINE)
ReaderTtsController.setEngine(context, ReaderTtsService.AUTO_ENGINE)
},
label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_auto)) }, label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_auto)) },
) )
FilterChip( FilterChip(
selected = selectedEngine == ReaderTtsService.SYSTEM_DEFAULT_ENGINE, selected = selectedEngine == ReaderTtsService.SYSTEM_DEFAULT_ENGINE,
onClick = { enginePref.set(ReaderTtsService.SYSTEM_DEFAULT_ENGINE) }, onClick = {
enginePref.set(ReaderTtsService.SYSTEM_DEFAULT_ENGINE)
ReaderTtsController.setEngine(context, ReaderTtsService.SYSTEM_DEFAULT_ENGINE)
},
label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_system)) }, label = { Text(stringResource(MR.strings.pref_text_reader_tts_engine_system)) },
) )
installedEngines.forEach { (packageName, label) -> installedEngines.forEach { (packageName, label) ->
FilterChip( FilterChip(
selected = selectedEngine == packageName, selected = selectedEngine == packageName,
onClick = { enginePref.set(packageName) }, onClick = {
enginePref.set(packageName)
ReaderTtsController.setEngine(context, packageName)
},
label = { Text(label) }, label = { Text(label) },
) )
} }
@@ -150,7 +169,7 @@ internal fun ColumnScope.TextSettingsPage(viewModel: ReaderSettingsViewModel) {
TextButton( TextButton(
onClick = { onClick = {
runCatching { runCatching {
context.startActivity(Intent("com.android.settings.TTS_SETTINGS")) ttsSettingsLauncher.launch(Intent("com.android.settings.TTS_SETTINGS"))
} }
}, },
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
@@ -70,4 +70,22 @@ object ReaderTtsController {
.putExtra(ReaderTtsService.EXTRA_SPEED, speed), .putExtra(ReaderTtsService.EXTRA_SPEED, speed),
) )
} }
fun setEngine(context: Context, enginePackage: String) {
if (!state.value.active) return
context.startService(
Intent(context, ReaderTtsService::class.java)
.setAction(ReaderTtsService.ACTION_SET_ENGINE)
.putExtra(ReaderTtsService.EXTRA_ENGINE_PACKAGE, enginePackage),
)
}
fun refreshVoiceSettings(context: Context, enginePackage: String) {
if (!state.value.active) return
context.startService(
Intent(context, ReaderTtsService::class.java)
.setAction(ReaderTtsService.ACTION_REFRESH_VOICE)
.putExtra(ReaderTtsService.EXTRA_ENGINE_PACKAGE, enginePackage),
)
}
} }
@@ -28,7 +28,12 @@ class ReaderTtsService : Service() {
private var currentPageText: String? = null private var currentPageText: String? = null
private var currentSegments: List<Segment> = emptyList() private var currentSegments: List<Segment> = emptyList()
private var segmentPosition = 0 private var segmentPosition = 0
private var segmentSpeechOffset = 0
private var currentUtteranceBaseOffset = 0
private var currentUtteranceId: String? = null
private var ttsGeneration = 0
private var playbackSpeed = DEFAULT_SPEED private var playbackSpeed = DEFAULT_SPEED
private var enginePreference = AUTO_ENGINE
private var readerChapterId = -1L private var readerChapterId = -1L
private var title = "Text reader" private var title = "Text reader"
private var subtitle: String? = null private var subtitle: String? = null
@@ -43,8 +48,13 @@ class ReaderTtsService : Service() {
ACTION_SET_SPEED -> { ACTION_SET_SPEED -> {
playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, playbackSpeed).coerceIn(MIN_SPEED, MAX_SPEED) playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, playbackSpeed).coerceIn(MIN_SPEED, MAX_SPEED)
tts?.setSpeechRate(playbackSpeed) tts?.setSpeechRate(playbackSpeed)
if (playing && initialized) restartCurrentUtterance()
refreshNotification() refreshNotification()
} }
ACTION_SET_ENGINE, ACTION_REFRESH_VOICE -> {
val requestedEngine = intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty()
reinitializeTts(requestedEngine)
}
} }
return START_NOT_STICKY return START_NOT_STICKY
} }
@@ -70,6 +80,7 @@ class ReaderTtsService : Service() {
title = intent.getStringExtra(EXTRA_TITLE).orEmpty().ifBlank { "Text reader" } title = intent.getStringExtra(EXTRA_TITLE).orEmpty().ifBlank { "Text reader" }
subtitle = intent.getStringExtra(EXTRA_SUBTITLE) subtitle = intent.getStringExtra(EXTRA_SUBTITLE)
playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, DEFAULT_SPEED).coerceIn(MIN_SPEED, MAX_SPEED) playbackSpeed = intent.getFloatExtra(EXTRA_SPEED, DEFAULT_SPEED).coerceIn(MIN_SPEED, MAX_SPEED)
enginePreference = intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty().ifBlank { AUTO_ENGINE }
val requestedPageIndex = intent.getIntExtra(EXTRA_START_PAGE_INDEX, 0) val requestedPageIndex = intent.getIntExtra(EXTRA_START_PAGE_INDEX, 0)
pagePosition = newSession.pages.indexOfFirst { it.readerPageIndex >= requestedPageIndex } pagePosition = newSession.pages.indexOfFirst { it.readerPageIndex >= requestedPageIndex }
@@ -78,6 +89,9 @@ class ReaderTtsService : Service() {
currentPageText = null currentPageText = null
currentSegments = emptyList() currentSegments = emptyList()
segmentPosition = 0 segmentPosition = 0
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
currentUtteranceId = null
playing = false playing = false
initialized = false initialized = false
@@ -92,17 +106,23 @@ class ReaderTtsService : Service() {
), ),
) )
initializeTts(intent.getStringExtra(EXTRA_ENGINE_PACKAGE).orEmpty()) initializeTts(enginePreference, resumeAfterInit = true)
} }
private fun initializeTts(enginePreference: String) { private fun initializeTts(
requestedEnginePreference: String,
resumeAfterInit: Boolean,
) {
enginePreference = requestedEnginePreference.ifBlank { AUTO_ENGINE }
val engine = resolveEngine(enginePreference) val engine = resolveEngine(enginePreference)
val generation = ++ttsGeneration
val listener = TextToSpeech.OnInitListener { status -> val listener = TextToSpeech.OnInitListener { status ->
mainHandler.post { mainHandler.post {
if (generation != ttsGeneration) return@post
if (status != TextToSpeech.SUCCESS) { if (status != TextToSpeech.SUCCESS) {
if (engine != null) { if (engine != null) {
cleanupTts() cleanupTts()
initializeTts(SYSTEM_DEFAULT_ENGINE) initializeTts(SYSTEM_DEFAULT_ENGINE, resumeAfterInit)
} else { } else {
stopPlayback() stopPlayback()
} }
@@ -120,9 +140,9 @@ class ReaderTtsService : Service() {
) )
setOnUtteranceProgressListener(progressListener) setOnUtteranceProgressListener(progressListener)
} }
playing = true playing = resumeAfterInit
updatePlaybackState() updatePlaybackState(clearHighlight = false)
speakCurrentSegment() if (playing) speakCurrentSegment()
} }
} }
@@ -133,6 +153,24 @@ class ReaderTtsService : Service() {
} }
} }
private fun reinitializeTts(requestedEnginePreference: String) {
if (session == null) return
val resumeAfterInit = playing
currentUtteranceId = null
cleanupTts()
initializeTts(
requestedEnginePreference.ifBlank { enginePreference },
resumeAfterInit = resumeAfterInit,
)
}
private fun restartCurrentUtterance() {
if (!playing || !initialized) return
currentUtteranceId = null
tts?.stop()
speakCurrentSegment()
}
private fun resolveEngine(preference: String): String? { private fun resolveEngine(preference: String): String? {
if (preference == SYSTEM_DEFAULT_ENGINE) return null if (preference == SYSTEM_DEFAULT_ENGINE) return null
if (preference.isNotBlank() && preference != AUTO_ENGINE) return preference if (preference.isNotBlank() && preference != AUTO_ENGINE) return preference
@@ -178,17 +216,32 @@ class ReaderTtsService : Service() {
} }
val segment = currentSegments[segmentPosition] val segment = currentSegments[segmentPosition]
val utteranceId = pagePosition.toString() + ":" + segmentPosition val speechOffset = segmentSpeechOffset.coerceIn(0, segment.text.length)
if (speechOffset >= segment.text.length) {
segmentSpeechOffset = 0
advanceSegment()
return
}
currentUtteranceBaseOffset = speechOffset
val utteranceId = "$ttsGeneration:$pagePosition:$segmentPosition:$speechOffset"
currentUtteranceId = utteranceId
val result = tts?.speak( val result = tts?.speak(
segment.text, segment.text.substring(speechOffset),
TextToSpeech.QUEUE_FLUSH, TextToSpeech.QUEUE_FLUSH,
null, null,
utteranceId, utteranceId,
) )
if (result == TextToSpeech.ERROR) advanceSegment() if (result == TextToSpeech.ERROR) {
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
}
} }
private fun advanceSegment() { private fun advanceSegment() {
currentUtteranceId = null
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
segmentPosition++ segmentPosition++
if (segmentPosition >= currentSegments.size) advancePage() else speakCurrentSegment() if (segmentPosition >= currentSegments.size) advancePage() else speakCurrentSegment()
} }
@@ -204,6 +257,9 @@ class ReaderTtsService : Service() {
currentPageText = null currentPageText = null
currentSegments = emptyList() currentSegments = emptyList()
segmentPosition = 0 segmentPosition = 0
segmentSpeechOffset = 0
currentUtteranceBaseOffset = 0
currentUtteranceId = null
speakCurrentSegment() speakCurrentSegment()
} }
@@ -223,6 +279,8 @@ class ReaderTtsService : Service() {
} }
private fun cleanupTts() { private fun cleanupTts() {
ttsGeneration++
currentUtteranceId = null
initialized = false initialized = false
tts?.stop() tts?.stop()
tts?.shutdown() tts?.shutdown()
@@ -314,30 +372,41 @@ class ReaderTtsService : Service() {
private val progressListener = object : UtteranceProgressListener() { private val progressListener = object : UtteranceProgressListener() {
override fun onStart(utteranceId: String?) { override fun onStart(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (!playing) return@post if (!playing || utteranceId != currentUtteranceId) return@post
currentSegments.getOrNull(segmentPosition)?.let(::publishHighlight) currentSegments.getOrNull(segmentPosition)?.let { segment ->
publishHighlight(segment, currentUtteranceBaseOffset, segment.text.length)
}
} }
} }
override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) { override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) {
mainHandler.post { mainHandler.post {
if (!playing) return@post if (!playing || utteranceId != currentUtteranceId) return@post
currentSegments.getOrNull(segmentPosition)?.let { segment -> currentSegments.getOrNull(segmentPosition)?.let { segment ->
publishHighlight(segment, start, end) val absoluteStart = (currentUtteranceBaseOffset + start).coerceIn(0, segment.text.length)
val absoluteEnd = (currentUtteranceBaseOffset + end).coerceIn(absoluteStart, segment.text.length)
segmentSpeechOffset = absoluteStart
publishHighlight(segment, absoluteStart, absoluteEnd)
} }
} }
} }
override fun onDone(utteranceId: String?) { override fun onDone(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (playing) advanceSegment() if (!playing || utteranceId != currentUtteranceId) return@post
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
} }
} }
@Deprecated("Deprecated in Java") @Deprecated("Deprecated in Java")
override fun onError(utteranceId: String?) { override fun onError(utteranceId: String?) {
mainHandler.post { mainHandler.post {
if (playing) advanceSegment() if (!playing || utteranceId != currentUtteranceId) return@post
currentUtteranceId = null
segmentSpeechOffset = 0
advanceSegment()
} }
} }
@@ -425,6 +494,8 @@ class ReaderTtsService : Service() {
const val ACTION_TOGGLE = "eu.kanade.tachiyomi.reader.tts.TOGGLE" const val ACTION_TOGGLE = "eu.kanade.tachiyomi.reader.tts.TOGGLE"
const val ACTION_STOP = "eu.kanade.tachiyomi.reader.tts.STOP" const val ACTION_STOP = "eu.kanade.tachiyomi.reader.tts.STOP"
const val ACTION_SET_SPEED = "eu.kanade.tachiyomi.reader.tts.SET_SPEED" const val ACTION_SET_SPEED = "eu.kanade.tachiyomi.reader.tts.SET_SPEED"
const val ACTION_SET_ENGINE = "eu.kanade.tachiyomi.reader.tts.SET_ENGINE"
const val ACTION_REFRESH_VOICE = "eu.kanade.tachiyomi.reader.tts.REFRESH_VOICE"
const val EXTRA_SESSION_ID = "session_id" const val EXTRA_SESSION_ID = "session_id"
const val EXTRA_START_PAGE_INDEX = "start_page_index" const val EXTRA_START_PAGE_INDEX = "start_page_index"