Talon
/
tardis-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes made to Watson to populate voices, then used VSCode to reformat, so that should resolve the conflict

pull/1/head
guilevi 2021-04-07 11:14:31 +02:00
parent 0b2b443efe 12a9f8fc53
commit 70686c2ce0
8 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tts/watson/index.js
View File

@ -5,6 +5,7 @@ const querystring = require('querystring');
module.exports = class extends BaseEngine {
constructor() {
super("IBM Watson TTS", "ogg");
<<<<<<< HEAD
this.voices = {};
this.populateVoiceList();
}
@ -16,6 +17,12 @@ module.exports = class extends BaseEngine {
headers: {
'Authorization': authorization
},
=======
this.voices = {
'Michael': 'en-US_MichaelV3Voice',
'Allison': 'en-US_AllisonV3Voice',
'Kevin': 'en-US_KevinV3Voice',
>>>>>>> 12a9f8fc5374d912e595cea204998daa4d7220ba
};
const res = await fetch(url, opts);
const voices = await res.json();
@ -27,6 +34,7 @@ module.exports = class extends BaseEngine {
getDefaultVoice() {
return 'Michael';
}
<<<<<<< HEAD
IBMAuthString() {
let buff = new Buffer('apikey:' + process.env.watsonAPIKey);
let b64auth = buff.toString('base64');
@ -35,6 +43,13 @@ module.exports = class extends BaseEngine {
async getSpeech(text, voice = this.getSpeechVoice(), params = {}) {
const url = process.env.watsonURL + "/v1/synthesize?voice=" + this.getInternalVoiceName(voice);
const authorization = this.IBMAuthString();
=======
async getSpeech(text, voice = this.getSpeechVoice(), params = {}) {
const url = process.env.watsonURL + "/v1/synthesize?voice=" + this.getInternalVoiceName(voice);
let buff = new Buffer('apikey:' + process.env.watsonAPIKey);
let b64auth = buff.toString('base64');
const authorization = 'Basic ' + b64auth;
>>>>>>> 12a9f8fc5374d912e595cea204998daa4d7220ba
const opts = {
method: "post",
headers: {