rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix one message tts playback

Browse Source
This commit is contained in:
ouoertheo
2023-05-16 18:56:39 -05:00
parent d71fa715ab
commit a8684993f4
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
public/scripts/extensions/tts/index.js
View File

@ -23,6 +23,24 @@ let ttsProviders = {
} }
let ttsProvider let ttsProvider
let ttsProviderName let ttsProviderName
let autoGeneration = true;
function resetTtsPlayback() {
// Clear currently processing jobs
currentTtsJob = null;
currentAudioJob = null;
// Reset audio element
audioElement.currentTime = 0;
audioElement.src = null;
// Clearn any queue items
ttsJobQueue.splice(0, ttsJobQueue.length);
audioJobQueue.splice(0, audioJobQueue.length);
// Set audio ready to process again
audioQueueProcessorReady = true;
}
async function onNarrateOneMessage() { async function onNarrateOneMessage() {
cancelTtsPlay(); cancelTtsPlay();
@ -34,11 +52,7 @@ async function onNarrateOneMessage() {
return; return;
} }
currentTtsJob = null; resetTtsPlayback()
audioElement.pause();
audioElement.currentTime = 0;
ttsJobQueue.splice(0, ttsJobQueue.length);
audioJobQueue.splice(0, audioJobQueue.length);
ttsJobQueue.push(message); ttsJobQueue.push(message);
moduleWorker(); moduleWorker();
} }
@ -62,7 +76,7 @@ async function moduleWorkerWrapper() {
} }
async function moduleWorker() { async function moduleWorker() {
// Primarily determinign when to add new chat to the TTS queue // Primarily determining when to add new chat to the TTS queue
const enabled = $('#tts_enabled').is(':checked') const enabled = $('#tts_enabled').is(':checked')
$('body').toggleClass('tts', enabled); $('body').toggleClass('tts', enabled);
if (!enabled) { if (!enabled) {
@ -136,7 +150,7 @@ let audioElement = new Audio()
let audioJobQueue = [] let audioJobQueue = []
let currentAudioJob let currentAudioJob
let audioPaused = false let audioPaused = false
let queueProcessorReady = true let audioQueueProcessorReady = true
let lastAudioPosition = 0 let lastAudioPosition = 0
@ -207,7 +221,7 @@ function addAudioControl() {
} }
function completeCurrentAudioJob() { function completeCurrentAudioJob() {
queueProcessorReady = true audioQueueProcessorReady = true
lastAudioPosition = 0 lastAudioPosition = 0
// updateUiPlayState(); // updateUiPlayState();
} }
@ -227,16 +241,16 @@ async function addAudioJob(response) {
async function processAudioJobQueue() { async function processAudioJobQueue() {
// Nothing to do, audio not completed, or audio paused - stop processing. // Nothing to do, audio not completed, or audio paused - stop processing.
if (audioJobQueue.length == 0 || !queueProcessorReady || audioPaused) { if (audioJobQueue.length == 0 || !audioQueueProcessorReady || audioPaused) {
return return
} }
try { try {
queueProcessorReady = false audioQueueProcessorReady = false
currentAudioJob = audioJobQueue.pop() currentAudioJob = audioJobQueue.pop()
playAudioData(currentAudioJob) playAudioData(currentAudioJob)
} catch (error) { } catch (error) {
console.error(error) console.error(error)
queueProcessorReady = true audioQueueProcessorReady = true
} }
} }