rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1081 from Jasonnor/staging 

TTS: Set character default voice from `disabled` to `default` (#1077)
This commit is contained in:
Cohee 2023-09-04 14:12:16 +03:00 committed by GitHub
parent 94ce06b257 6d2caf94bf
commit 47893b9a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,7 +462,7 @@ async function processTtsQueue() {
return; return;
} }
const voiceMapEntry = voiceMap[char] || voiceMap[DEFAULT_VOICE_MARKER] const voiceMapEntry = voiceMap[char] === DEFAULT_VOICE_MARKER ? voiceMap[DEFAULT_VOICE_MARKER] : voiceMap[char]
if (!voiceMapEntry) { if (!voiceMapEntry) {
throw `${char} not in voicemap. Configure character in extension settings voice map` throw `${char} not in voicemap. Configure character in extension settings voice map`
@ -708,7 +708,7 @@ class VoiceMapEntry {
name name
voiceId voiceId
selectElement selectElement
constructor (name, voiceId='disabled') { constructor (name, voiceId=DEFAULT_VOICE_MARKER) {
this.name = name this.name = name
this.voiceId = voiceId this.voiceId = voiceId
this.selectElement = null this.selectElement = null
@ -716,11 +716,14 @@ class VoiceMapEntry {
addUI(voiceIds){ addUI(voiceIds){
let sanitizedName = sanitizeId(this.name) let sanitizedName = sanitizeId(this.name)
let defaultOption = this.name === DEFAULT_VOICE_MARKER ?
'<option>disabled</option>' :
`<option>${DEFAULT_VOICE_MARKER}</option><option>disabled</option>`
let template = ` let template = `
<div class='tts_voicemap_block_char flex-container flexGap5'> <div class='tts_voicemap_block_char flex-container flexGap5'>
<span id='tts_voicemap_char_${sanitizedName}'>${this.name}</span> <span id='tts_voicemap_char_${sanitizedName}'>${this.name}</span>
<select id='tts_voicemap_char_${sanitizedName}_voice'> <select id='tts_voicemap_char_${sanitizedName}_voice'>
<option>disabled</option> ${defaultOption}
</select> </select>
</div> </div>
` `
@ -804,8 +807,10 @@ export async function initVoiceMap(){
let voiceId let voiceId
if (character in voiceMapFromSettings){ if (character in voiceMapFromSettings){
voiceId = voiceMapFromSettings[character] voiceId = voiceMapFromSettings[character]
} else { } else if (character === DEFAULT_VOICE_MARKER) {
voiceId = 'disabled' voiceId = 'disabled'
} else {
voiceId = DEFAULT_VOICE_MARKER
} }
const voiceMapEntry = new VoiceMapEntry(character, voiceId) const voiceMapEntry = new VoiceMapEntry(character, voiceId)
voiceMapEntry.addUI(voiceIdsFromProvider) voiceMapEntry.addUI(voiceIdsFromProvider)