mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 05:05:20 -05:00
Make labels in generated TTS / Encoder setting dialogs translatable.
Code police: break some long lines, remove trailing spaces. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21237 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
0711190db1
commit
86041b1d33
2 changed files with 276 additions and 257 deletions
|
|
@ -79,20 +79,22 @@ QStringList EncBase::getEncoderList()
|
||||||
EncExes::EncExes(QString name,QObject *parent) : EncBase(parent)
|
EncExes::EncExes(QString name,QObject *parent) : EncBase(parent)
|
||||||
{
|
{
|
||||||
m_name = name;
|
m_name = name;
|
||||||
|
|
||||||
m_TemplateMap["lame"] = "\"%exe\" %options \"%input\" \"%output\"";
|
m_TemplateMap["lame"] = "\"%exe\" %options \"%input\" \"%output\"";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void EncExes::generateSettings()
|
void EncExes::generateSettings()
|
||||||
{
|
{
|
||||||
QString exepath =RbSettings::subValue(m_name,RbSettings::EncoderPath).toString();
|
QString exepath =RbSettings::subValue(m_name,RbSettings::EncoderPath).toString();
|
||||||
if(exepath == "") exepath = findExecutable(m_name);
|
if(exepath == "") exepath = findExecutable(m_name);
|
||||||
|
|
||||||
insertSetting(eEXEPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Path to Encoder:",exepath,EncTtsSetting::eBROWSEBTN));
|
insertSetting(eEXEPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
insertSetting(eEXEOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Encoder options:",RbSettings::subValue(m_name,RbSettings::EncoderOptions)));
|
tr("Path to Encoder:"),exepath,EncTtsSetting::eBROWSEBTN));
|
||||||
|
insertSetting(eEXEOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
|
tr("Encoder options:"),RbSettings::subValue(m_name,RbSettings::EncoderOptions)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void EncExes::saveSettings()
|
void EncExes::saveSettings()
|
||||||
|
|
@ -106,7 +108,7 @@ bool EncExes::start()
|
||||||
{
|
{
|
||||||
m_EncExec = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
|
m_EncExec = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
|
||||||
m_EncOpts = RbSettings::subValue(m_name, RbSettings::EncoderOptions).toString();
|
m_EncOpts = RbSettings::subValue(m_name, RbSettings::EncoderOptions).toString();
|
||||||
|
|
||||||
m_EncTemplate = m_TemplateMap.value(m_name);
|
m_EncTemplate = m_TemplateMap.value(m_name);
|
||||||
|
|
||||||
QFileInfo enc(m_EncExec);
|
QFileInfo enc(m_EncExec);
|
||||||
|
|
@ -138,10 +140,10 @@ bool EncExes::encode(QString input,QString output)
|
||||||
bool EncExes::configOk()
|
bool EncExes::configOk()
|
||||||
{
|
{
|
||||||
QString path = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
|
QString path = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
|
||||||
|
|
||||||
if (QFileInfo(path).exists())
|
if (QFileInfo(path).exists())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -150,46 +152,54 @@ bool EncExes::configOk()
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
EncRbSpeex::EncRbSpeex(QObject *parent) : EncBase(parent)
|
EncRbSpeex::EncRbSpeex(QObject *parent) : EncBase(parent)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EncRbSpeex::generateSettings()
|
void EncRbSpeex::generateSettings()
|
||||||
{
|
{
|
||||||
insertSetting(eVOLUME,new EncTtsSetting(this,EncTtsSetting::eDOUBLE,"Volume:",RbSettings::subValue("rbspeex",RbSettings::EncoderVolume),1.0,10.0));
|
insertSetting(eVOLUME,new EncTtsSetting(this,EncTtsSetting::eDOUBLE,
|
||||||
insertSetting(eQUALITY,new EncTtsSetting(this,EncTtsSetting::eDOUBLE,"Quality:",RbSettings::subValue("rbspeex",RbSettings::EncoderQuality),0,10.0));
|
tr("Volume:"),RbSettings::subValue("rbspeex",RbSettings::EncoderVolume),1.0,10.0));
|
||||||
insertSetting(eCOMPLEXITY,new EncTtsSetting(this,EncTtsSetting::eINT,"Complexity:",RbSettings::subValue("rbspeex",RbSettings::EncoderComplexity),0,10));
|
insertSetting(eQUALITY,new EncTtsSetting(this,EncTtsSetting::eDOUBLE,
|
||||||
insertSetting(eNARROWBAND,new EncTtsSetting(this,EncTtsSetting::eBOOL,"Use Narrowband:",RbSettings::subValue("rbspeex",RbSettings::EncoderNarrowBand)));
|
tr("Quality:"),RbSettings::subValue("rbspeex",RbSettings::EncoderQuality),0,10.0));
|
||||||
|
insertSetting(eCOMPLEXITY,new EncTtsSetting(this,EncTtsSetting::eINT,
|
||||||
|
tr("Complexity:"),RbSettings::subValue("rbspeex",RbSettings::EncoderComplexity),0,10));
|
||||||
|
insertSetting(eNARROWBAND,new EncTtsSetting(this,EncTtsSetting::eBOOL,
|
||||||
|
tr("Use Narrowband:"),RbSettings::subValue("rbspeex",RbSettings::EncoderNarrowBand)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void EncRbSpeex::saveSettings()
|
void EncRbSpeex::saveSettings()
|
||||||
{
|
{
|
||||||
//save settings in user config
|
//save settings in user config
|
||||||
RbSettings::setSubValue("rbspeex",RbSettings::EncoderVolume,getSetting(eVOLUME)->current().toDouble());
|
RbSettings::setSubValue("rbspeex",RbSettings::EncoderVolume,
|
||||||
RbSettings::setSubValue("rbspeex",RbSettings::EncoderQuality,getSetting(eQUALITY)->current().toDouble());
|
getSetting(eVOLUME)->current().toDouble());
|
||||||
RbSettings::setSubValue("rbspeex",RbSettings::EncoderComplexity,getSetting(eCOMPLEXITY)->current().toInt());
|
RbSettings::setSubValue("rbspeex",RbSettings::EncoderQuality,
|
||||||
RbSettings::setSubValue("rbspeex",RbSettings::EncoderNarrowBand,getSetting(eNARROWBAND)->current().toBool());
|
getSetting(eQUALITY)->current().toDouble());
|
||||||
|
RbSettings::setSubValue("rbspeex",RbSettings::EncoderComplexity,
|
||||||
|
getSetting(eCOMPLEXITY)->current().toInt());
|
||||||
|
RbSettings::setSubValue("rbspeex",RbSettings::EncoderNarrowBand,
|
||||||
|
getSetting(eNARROWBAND)->current().toBool());
|
||||||
|
|
||||||
RbSettings::sync();
|
RbSettings::sync();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EncRbSpeex::start()
|
bool EncRbSpeex::start()
|
||||||
{
|
{
|
||||||
|
|
||||||
// try to get config from settings
|
// try to get config from settings
|
||||||
quality = RbSettings::subValue("rbspeex", RbSettings::EncoderQuality).toDouble();
|
quality = RbSettings::subValue("rbspeex", RbSettings::EncoderQuality).toDouble();
|
||||||
complexity = RbSettings::subValue("rbspeex", RbSettings::EncoderComplexity).toInt();
|
complexity = RbSettings::subValue("rbspeex", RbSettings::EncoderComplexity).toInt();
|
||||||
volume = RbSettings::subValue("rbspeex", RbSettings::EncoderVolume).toDouble();
|
volume = RbSettings::subValue("rbspeex", RbSettings::EncoderVolume).toDouble();
|
||||||
narrowband = RbSettings::subValue("rbspeex", RbSettings::EncoderNarrowBand).toBool();
|
narrowband = RbSettings::subValue("rbspeex", RbSettings::EncoderNarrowBand).toBool();
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool EncRbSpeex::encode(QString input,QString output)
|
bool EncRbSpeex::encode(QString input,QString output)
|
||||||
{
|
{
|
||||||
qDebug() << "encoding " << input << " to "<< output;
|
qDebug() << "encoding " << input << " to "<< output;
|
||||||
char errstr[512];
|
char errstr[512];
|
||||||
|
|
||||||
FILE *fin,*fout;
|
FILE *fin,*fout;
|
||||||
if ((fin = fopen(input.toLocal8Bit(), "rb")) == NULL) {
|
if ((fin = fopen(input.toLocal8Bit(), "rb")) == NULL) {
|
||||||
qDebug() << "Error: could not open input file\n";
|
qDebug() << "Error: could not open input file\n";
|
||||||
|
|
@ -219,16 +229,16 @@ bool EncRbSpeex::configOk()
|
||||||
{
|
{
|
||||||
bool result=true;
|
bool result=true;
|
||||||
// check config
|
// check config
|
||||||
|
|
||||||
if(RbSettings::subValue("rbspeex", RbSettings::EncoderVolume).toDouble() <= 0)
|
if(RbSettings::subValue("rbspeex", RbSettings::EncoderVolume).toDouble() <= 0)
|
||||||
result =false;
|
result =false;
|
||||||
|
|
||||||
if(RbSettings::subValue("rbspeex", RbSettings::EncoderQuality).toDouble() <= 0)
|
if(RbSettings::subValue("rbspeex", RbSettings::EncoderQuality).toDouble() <= 0)
|
||||||
result =false;
|
result =false;
|
||||||
|
|
||||||
if(RbSettings::subValue("rbspeex", RbSettings::EncoderComplexity).toInt() <= 0)
|
if(RbSettings::subValue("rbspeex", RbSettings::EncoderComplexity).toInt() <= 0)
|
||||||
result =false;
|
result =false;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ void TTSBase::initTTSList()
|
||||||
// function to get a specific encoder
|
// function to get a specific encoder
|
||||||
TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName)
|
TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName)
|
||||||
{
|
{
|
||||||
|
|
||||||
TTSBase* tts;
|
TTSBase* tts;
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
if(ttsName == "sapi")
|
if(ttsName == "sapi")
|
||||||
|
|
@ -55,13 +55,13 @@ TTSBase* TTSBase::getTTS(QObject* parent,QString ttsName)
|
||||||
tts = new TTSSapi(parent);
|
tts = new TTSSapi(parent);
|
||||||
return tts;
|
return tts;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
if (ttsName == "festival")
|
if (ttsName == "festival")
|
||||||
{
|
{
|
||||||
tts = new TTSFestival(parent);
|
tts = new TTSFestival(parent);
|
||||||
return tts;
|
return tts;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -97,20 +97,22 @@ QString TTSBase::getTTSName(QString tts)
|
||||||
TTSExes::TTSExes(QString name,QObject* parent) : TTSBase(parent)
|
TTSExes::TTSExes(QString name,QObject* parent) : TTSBase(parent)
|
||||||
{
|
{
|
||||||
m_name = name;
|
m_name = name;
|
||||||
|
|
||||||
m_TemplateMap["espeak"] = "\"%exe\" %options -w \"%wavfile\" \"%text\"";
|
m_TemplateMap["espeak"] = "\"%exe\" %options -w \"%wavfile\" \"%text\"";
|
||||||
m_TemplateMap["flite"] = "\"%exe\" %options -o \"%wavfile\" -t \"%text\"";
|
m_TemplateMap["flite"] = "\"%exe\" %options -o \"%wavfile\" -t \"%text\"";
|
||||||
m_TemplateMap["swift"] = "\"%exe\" %options -o \"%wavfile\" \"%text\"";
|
m_TemplateMap["swift"] = "\"%exe\" %options -o \"%wavfile\" \"%text\"";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSExes::generateSettings()
|
void TTSExes::generateSettings()
|
||||||
{
|
{
|
||||||
QString exepath =RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
QString exepath =RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
||||||
if(exepath == "") exepath = findExecutable(m_name);
|
if(exepath == "") exepath = findExecutable(m_name);
|
||||||
|
|
||||||
insertSetting(eEXEPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Path to TTS engine:",exepath,EncTtsSetting::eBROWSEBTN));
|
insertSetting(eEXEPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,"TTS engine options:",RbSettings::subValue(m_name,RbSettings::TtsOptions)));
|
tr("Path to TTS engine:"),exepath,EncTtsSetting::eBROWSEBTN));
|
||||||
|
insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
|
tr("TTS engine options:"),RbSettings::subValue(m_name,RbSettings::TtsOptions)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSExes::saveSettings()
|
void TTSExes::saveSettings()
|
||||||
|
|
@ -124,7 +126,7 @@ bool TTSExes::start(QString *errStr)
|
||||||
{
|
{
|
||||||
m_TTSexec = RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
m_TTSexec = RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
||||||
m_TTSOpts = RbSettings::subValue(m_name,RbSettings::TtsOptions).toString();
|
m_TTSOpts = RbSettings::subValue(m_name,RbSettings::TtsOptions).toString();
|
||||||
|
|
||||||
m_TTSTemplate = m_TemplateMap.value(m_name);
|
m_TTSTemplate = m_TemplateMap.value(m_name);
|
||||||
|
|
||||||
QFileInfo tts(m_TTSexec);
|
QFileInfo tts(m_TTSexec);
|
||||||
|
|
@ -141,7 +143,7 @@ bool TTSExes::start(QString *errStr)
|
||||||
|
|
||||||
TTSStatus TTSExes::voice(QString text,QString wavfile, QString *errStr)
|
TTSStatus TTSExes::voice(QString text,QString wavfile, QString *errStr)
|
||||||
{
|
{
|
||||||
(void) errStr;
|
(void) errStr;
|
||||||
QString execstring = m_TTSTemplate;
|
QString execstring = m_TTSTemplate;
|
||||||
|
|
||||||
execstring.replace("%exe",m_TTSexec);
|
execstring.replace("%exe",m_TTSexec);
|
||||||
|
|
@ -157,10 +159,10 @@ TTSStatus TTSExes::voice(QString text,QString wavfile, QString *errStr)
|
||||||
bool TTSExes::configOk()
|
bool TTSExes::configOk()
|
||||||
{
|
{
|
||||||
QString path = RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
QString path = RbSettings::subValue(m_name,RbSettings::TtsPath).toString();
|
||||||
|
|
||||||
if (QFileInfo(path).exists())
|
if (QFileInfo(path).exists())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,18 +180,22 @@ void TTSSapi::generateSettings()
|
||||||
{
|
{
|
||||||
// language
|
// language
|
||||||
QStringList languages = RbSettings::languages();
|
QStringList languages = RbSettings::languages();
|
||||||
languages.sort();
|
languages.sort();
|
||||||
EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,"Language:",RbSettings::subValue("sapi",RbSettings::TtsLanguage),languages);
|
EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,
|
||||||
|
tr("Language:"),RbSettings::subValue("sapi",RbSettings::TtsLanguage),languages);
|
||||||
connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList()));
|
connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList()));
|
||||||
insertSetting(eLANGUAGE,setting);
|
insertSetting(eLANGUAGE,setting);
|
||||||
// voice
|
// voice
|
||||||
setting = new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,"Voice:",RbSettings::subValue("sapi",RbSettings::TtsVoice),getVoiceList(RbSettings::subValue("sapi",RbSettings::TtsLanguage).toString()),EncTtsSetting::eREFRESHBTN);
|
setting = new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,
|
||||||
|
tr("Voice:"),RbSettings::subValue("sapi",RbSettings::TtsVoice),getVoiceList(RbSettings::subValue("sapi",RbSettings::TtsLanguage).toString()),EncTtsSetting::eREFRESHBTN);
|
||||||
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList()));
|
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList()));
|
||||||
insertSetting(eVOICE,setting);
|
insertSetting(eVOICE,setting);
|
||||||
//speed
|
//speed
|
||||||
insertSetting(eSPEED,new EncTtsSetting(this,EncTtsSetting::eINT,"Speed:",RbSettings::subValue("sapi",RbSettings::TtsSpeed),-10,10));
|
insertSetting(eSPEED,new EncTtsSetting(this,EncTtsSetting::eINT,
|
||||||
|
tr("Speed:"),RbSettings::subValue("sapi",RbSettings::TtsSpeed),-10,10));
|
||||||
// options
|
// options
|
||||||
insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Options:",RbSettings::subValue("sapi",RbSettings::TtsOptions)));
|
insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
|
tr("Options:"),RbSettings::subValue("sapi",RbSettings::TtsOptions)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -200,7 +206,7 @@ void TTSSapi::saveSettings()
|
||||||
RbSettings::setSubValue("sapi",RbSettings::TtsVoice,getSetting(eVOICE)->current().toString());
|
RbSettings::setSubValue("sapi",RbSettings::TtsVoice,getSetting(eVOICE)->current().toString());
|
||||||
RbSettings::setSubValue("sapi",RbSettings::TtsSpeed,getSetting(eSPEED)->current().toInt());
|
RbSettings::setSubValue("sapi",RbSettings::TtsSpeed,getSetting(eSPEED)->current().toInt());
|
||||||
RbSettings::setSubValue("sapi",RbSettings::TtsOptions,getSetting(eOPTIONS)->current().toString());
|
RbSettings::setSubValue("sapi",RbSettings::TtsOptions,getSetting(eOPTIONS)->current().toString());
|
||||||
|
|
||||||
RbSettings::sync();
|
RbSettings::sync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -210,28 +216,28 @@ void TTSSapi::updateVoiceList()
|
||||||
QStringList voiceList = getVoiceList(getSetting(eLANGUAGE)->current().toString());
|
QStringList voiceList = getVoiceList(getSetting(eLANGUAGE)->current().toString());
|
||||||
getSetting(eVOICE)->setList(voiceList);
|
getSetting(eVOICE)->setList(voiceList);
|
||||||
if(voiceList.size() > 0) getSetting(eVOICE)->setCurrent(voiceList.at(0));
|
if(voiceList.size() > 0) getSetting(eVOICE)->setCurrent(voiceList.at(0));
|
||||||
else getSetting(eVOICE)->setCurrent("");
|
else getSetting(eVOICE)->setCurrent("");
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSSapi::start(QString *errStr)
|
bool TTSSapi::start(QString *errStr)
|
||||||
{
|
{
|
||||||
|
|
||||||
m_TTSOpts = RbSettings::subValue("sapi",RbSettings::TtsOptions).toString();
|
m_TTSOpts = RbSettings::subValue("sapi",RbSettings::TtsOptions).toString();
|
||||||
m_TTSLanguage =RbSettings::subValue("sapi",RbSettings::TtsLanguage).toString();
|
m_TTSLanguage =RbSettings::subValue("sapi",RbSettings::TtsLanguage).toString();
|
||||||
m_TTSVoice=RbSettings::subValue("sapi",RbSettings::TtsVoice).toString();
|
m_TTSVoice=RbSettings::subValue("sapi",RbSettings::TtsVoice).toString();
|
||||||
m_TTSSpeed=RbSettings::subValue("sapi",RbSettings::TtsSpeed).toString();
|
m_TTSSpeed=RbSettings::subValue("sapi",RbSettings::TtsSpeed).toString();
|
||||||
m_sapi4 = RbSettings::subValue("sapi",RbSettings::TtsUseSapi4).toBool();
|
m_sapi4 = RbSettings::subValue("sapi",RbSettings::TtsUseSapi4).toBool();
|
||||||
|
|
||||||
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
||||||
QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
|
QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
|
||||||
m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
|
m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
|
||||||
|
|
||||||
QFileInfo tts(m_TTSexec);
|
QFileInfo tts(m_TTSexec);
|
||||||
if(!tts.exists())
|
if(!tts.exists())
|
||||||
{
|
{
|
||||||
*errStr = tr("Could not copy the Sapi-script");
|
*errStr = tr("Could not copy the Sapi-script");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// create the voice process
|
// create the voice process
|
||||||
QString execstring = m_TTSTemplate;
|
QString execstring = m_TTSTemplate;
|
||||||
execstring.replace("%exe",m_TTSexec);
|
execstring.replace("%exe",m_TTSexec);
|
||||||
|
|
@ -239,31 +245,31 @@ bool TTSSapi::start(QString *errStr)
|
||||||
execstring.replace("%lang",m_TTSLanguage);
|
execstring.replace("%lang",m_TTSLanguage);
|
||||||
execstring.replace("%voice",m_TTSVoice);
|
execstring.replace("%voice",m_TTSVoice);
|
||||||
execstring.replace("%speed",m_TTSSpeed);
|
execstring.replace("%speed",m_TTSSpeed);
|
||||||
|
|
||||||
if(m_sapi4)
|
if(m_sapi4)
|
||||||
execstring.append(" /sapi4 ");
|
execstring.append(" /sapi4 ");
|
||||||
|
|
||||||
qDebug() << "init" << execstring;
|
qDebug() << "init" << execstring;
|
||||||
voicescript = new QProcess(NULL);
|
voicescript = new QProcess(NULL);
|
||||||
//connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error()));
|
//connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error()));
|
||||||
|
|
||||||
voicescript->start(execstring);
|
voicescript->start(execstring);
|
||||||
if(!voicescript->waitForStarted())
|
if(!voicescript->waitForStarted())
|
||||||
{
|
{
|
||||||
*errStr = tr("Could not start the Sapi-script");
|
*errStr = tr("Could not start the Sapi-script");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!voicescript->waitForReadyRead(300))
|
if(!voicescript->waitForReadyRead(300))
|
||||||
{
|
{
|
||||||
*errStr = voicescript->readAllStandardError();
|
*errStr = voicescript->readAllStandardError();
|
||||||
if(*errStr != "")
|
if(*errStr != "")
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
voicestream = new QTextStream(voicescript);
|
voicestream = new QTextStream(voicescript);
|
||||||
voicestream->setCodec("UTF16-LE");
|
voicestream->setCodec("UTF16-LE");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -271,31 +277,31 @@ bool TTSSapi::start(QString *errStr)
|
||||||
QStringList TTSSapi::getVoiceList(QString language)
|
QStringList TTSSapi::getVoiceList(QString language)
|
||||||
{
|
{
|
||||||
QStringList result;
|
QStringList result;
|
||||||
|
|
||||||
QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
|
QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
|
||||||
m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
|
m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
|
||||||
|
|
||||||
QFileInfo tts(m_TTSexec);
|
QFileInfo tts(m_TTSexec);
|
||||||
if(!tts.exists())
|
if(!tts.exists())
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
// create the voice process
|
// create the voice process
|
||||||
QString execstring = "cscript //nologo \"%exe\" /language:%lang /listvoices";
|
QString execstring = "cscript //nologo \"%exe\" /language:%lang /listvoices";
|
||||||
execstring.replace("%exe",m_TTSexec);
|
execstring.replace("%exe",m_TTSexec);
|
||||||
execstring.replace("%lang",language);
|
execstring.replace("%lang",language);
|
||||||
|
|
||||||
if(RbSettings::value(RbSettings::TtsUseSapi4).toBool())
|
if(RbSettings::value(RbSettings::TtsUseSapi4).toBool())
|
||||||
execstring.append(" /sapi4 ");
|
execstring.append(" /sapi4 ");
|
||||||
|
|
||||||
qDebug() << "init" << execstring;
|
qDebug() << "init" << execstring;
|
||||||
voicescript = new QProcess(NULL);
|
voicescript = new QProcess(NULL);
|
||||||
voicescript->start(execstring);
|
voicescript->start(execstring);
|
||||||
qDebug() << "wait for started";
|
qDebug() << "wait for started";
|
||||||
if(!voicescript->waitForStarted())
|
if(!voicescript->waitForStarted())
|
||||||
return result;
|
return result;
|
||||||
voicescript->closeWriteChannel();
|
voicescript->closeWriteChannel();
|
||||||
voicescript->waitForReadyRead();
|
voicescript->waitForReadyRead();
|
||||||
|
|
||||||
QString dataRaw = voicescript->readAllStandardError().data();
|
QString dataRaw = voicescript->readAllStandardError().data();
|
||||||
result = dataRaw.split(",",QString::SkipEmptyParts);
|
result = dataRaw.split(",",QString::SkipEmptyParts);
|
||||||
if(result.size() > 0)
|
if(result.size() > 0)
|
||||||
|
|
@ -306,13 +312,13 @@ QStringList TTSSapi::getVoiceList(QString language)
|
||||||
{
|
{
|
||||||
result[i] = result.at(i).simplified();
|
result[i] = result.at(i).simplified();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
delete voicescript;
|
delete voicescript;
|
||||||
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner
|
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner
|
||||||
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
|
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
|
||||||
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
||||||
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
||||||
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -321,7 +327,7 @@ QStringList TTSSapi::getVoiceList(QString language)
|
||||||
|
|
||||||
TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
|
TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
|
||||||
{
|
{
|
||||||
(void) errStr;
|
(void) errStr;
|
||||||
QString query = "SPEAK\t"+wavfile+"\t"+text+"\r\n";
|
QString query = "SPEAK\t"+wavfile+"\t"+text+"\r\n";
|
||||||
qDebug() << "voicing" << query;
|
qDebug() << "voicing" << query;
|
||||||
*voicestream << query;
|
*voicestream << query;
|
||||||
|
|
@ -332,17 +338,17 @@ TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSSapi::stop()
|
bool TTSSapi::stop()
|
||||||
{
|
{
|
||||||
|
|
||||||
*voicestream << "QUIT\r\n";
|
*voicestream << "QUIT\r\n";
|
||||||
voicestream->flush();
|
voicestream->flush();
|
||||||
voicescript->waitForFinished();
|
voicescript->waitForFinished();
|
||||||
delete voicestream;
|
delete voicestream;
|
||||||
delete voicescript;
|
delete voicescript;
|
||||||
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner
|
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner
|
||||||
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
|
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
|
||||||
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
||||||
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
||||||
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -358,7 +364,7 @@ bool TTSSapi::configOk()
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
TTSFestival::~TTSFestival()
|
TTSFestival::~TTSFestival()
|
||||||
{
|
{
|
||||||
stop();
|
stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestival::generateSettings()
|
void TTSFestival::generateSettings()
|
||||||
|
|
@ -366,21 +372,24 @@ void TTSFestival::generateSettings()
|
||||||
// server path
|
// server path
|
||||||
QString exepath = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
QString exepath = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
||||||
if(exepath == "" ) exepath = findExecutable("festival");
|
if(exepath == "" ) exepath = findExecutable("festival");
|
||||||
insertSetting(eSERVERPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Path to Festival server:",exepath,EncTtsSetting::eBROWSEBTN));
|
insertSetting(eSERVERPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Path to Festival server:",exepath,EncTtsSetting::eBROWSEBTN));
|
||||||
|
|
||||||
// client path
|
// client path
|
||||||
QString clientpath = RbSettings::subValue("festival-client",RbSettings::TtsPath).toString();
|
QString clientpath = RbSettings::subValue("festival-client",RbSettings::TtsPath).toString();
|
||||||
if(clientpath == "" ) clientpath = findExecutable("festival_client");
|
if(clientpath == "" ) clientpath = findExecutable("festival_client");
|
||||||
insertSetting(eCLIENTPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,"Path to Festival client:",clientpath,EncTtsSetting::eBROWSEBTN));
|
insertSetting(eCLIENTPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,
|
||||||
|
tr("Path to Festival client:"),clientpath,EncTtsSetting::eBROWSEBTN));
|
||||||
|
|
||||||
// voice
|
// voice
|
||||||
EncTtsSetting* setting = new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,"Voice:",RbSettings::subValue("festival",RbSettings::TtsVoice),getVoiceList(exepath),EncTtsSetting::eREFRESHBTN);
|
EncTtsSetting* setting = new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,
|
||||||
|
tr("Voice:"),RbSettings::subValue("festival",RbSettings::TtsVoice),getVoiceList(exepath),EncTtsSetting::eREFRESHBTN);
|
||||||
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList()));
|
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList()));
|
||||||
connect(setting,SIGNAL(dataChanged()),this,SLOT(clearVoiceDescription()));
|
connect(setting,SIGNAL(dataChanged()),this,SLOT(clearVoiceDescription()));
|
||||||
insertSetting(eVOICE,setting);
|
insertSetting(eVOICE,setting);
|
||||||
|
|
||||||
//voice description
|
//voice description
|
||||||
setting = new EncTtsSetting(this,EncTtsSetting::eREADONLYSTRING,"Voice description:","",EncTtsSetting::eREFRESHBTN);
|
setting = new EncTtsSetting(this,EncTtsSetting::eREADONLYSTRING,
|
||||||
|
tr("Voice description:"),"",EncTtsSetting::eREFRESHBTN);
|
||||||
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceDescription()));
|
connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceDescription()));
|
||||||
insertSetting(eVOICEDESC,setting);
|
insertSetting(eVOICEDESC,setting);
|
||||||
}
|
}
|
||||||
|
|
@ -391,13 +400,13 @@ void TTSFestival::saveSettings()
|
||||||
RbSettings::setSubValue("festival-server",RbSettings::TtsPath,getSetting(eSERVERPATH)->current().toString());
|
RbSettings::setSubValue("festival-server",RbSettings::TtsPath,getSetting(eSERVERPATH)->current().toString());
|
||||||
RbSettings::setSubValue("festival-client",RbSettings::TtsPath,getSetting(eCLIENTPATH)->current().toString());
|
RbSettings::setSubValue("festival-client",RbSettings::TtsPath,getSetting(eCLIENTPATH)->current().toString());
|
||||||
RbSettings::setSubValue("festival",RbSettings::TtsVoice,getSetting(eVOICE)->current().toString());
|
RbSettings::setSubValue("festival",RbSettings::TtsVoice,getSetting(eVOICE)->current().toString());
|
||||||
|
|
||||||
RbSettings::sync();
|
RbSettings::sync();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestival::updateVoiceDescription()
|
void TTSFestival::updateVoiceDescription()
|
||||||
{
|
{
|
||||||
// get voice Info with current voice and path
|
// get voice Info with current voice and path
|
||||||
QString info = getVoiceInfo(getSetting(eVOICE)->current().toString(),getSetting(eSERVERPATH)->current().toString());
|
QString info = getVoiceInfo(getSetting(eVOICE)->current().toString(),getSetting(eSERVERPATH)->current().toString());
|
||||||
getSetting(eVOICEDESC)->setCurrent(info);
|
getSetting(eVOICEDESC)->setCurrent(info);
|
||||||
}
|
}
|
||||||
|
|
@ -417,241 +426,241 @@ void TTSFestival::updateVoiceList()
|
||||||
|
|
||||||
void TTSFestival::startServer(QString path)
|
void TTSFestival::startServer(QString path)
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(path == "")
|
if(path == "")
|
||||||
path = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
path = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
||||||
|
|
||||||
serverProcess.start(QString("%1 --server").arg(path));
|
serverProcess.start(QString("%1 --server").arg(path));
|
||||||
serverProcess.waitForStarted();
|
serverProcess.waitForStarted();
|
||||||
|
|
||||||
queryServer("(getpid)",300,path);
|
queryServer("(getpid)",300,path);
|
||||||
if(serverProcess.state() == QProcess::Running)
|
if(serverProcess.state() == QProcess::Running)
|
||||||
qDebug() << "Festival is up and running";
|
qDebug() << "Festival is up and running";
|
||||||
else
|
else
|
||||||
qDebug() << "Festival failed to start";
|
qDebug() << "Festival failed to start";
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestival::ensureServerRunning(QString path)
|
void TTSFestival::ensureServerRunning(QString path)
|
||||||
{
|
{
|
||||||
if(serverProcess.state() != QProcess::Running)
|
if(serverProcess.state() != QProcess::Running)
|
||||||
{
|
{
|
||||||
startServer(path);
|
startServer(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSFestival::start(QString* errStr)
|
bool TTSFestival::start(QString* errStr)
|
||||||
{
|
{
|
||||||
(void) errStr;
|
(void) errStr;
|
||||||
ensureServerRunning();
|
ensureServerRunning();
|
||||||
if (!RbSettings::subValue("festival",RbSettings::TtsVoice).toString().isEmpty())
|
if (!RbSettings::subValue("festival",RbSettings::TtsVoice).toString().isEmpty())
|
||||||
queryServer(QString("(voice.select '%1)")
|
queryServer(QString("(voice.select '%1)")
|
||||||
.arg(RbSettings::subValue("festival", RbSettings::TtsVoice).toString()));
|
.arg(RbSettings::subValue("festival", RbSettings::TtsVoice).toString()));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSFestival::stop()
|
bool TTSFestival::stop()
|
||||||
{
|
{
|
||||||
serverProcess.terminate();
|
serverProcess.terminate();
|
||||||
serverProcess.kill();
|
serverProcess.kill();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr)
|
TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr)
|
||||||
{
|
{
|
||||||
qDebug() << text << "->" << wavfile;
|
qDebug() << text << "->" << wavfile;
|
||||||
|
|
||||||
QString path = RbSettings::subValue("festival-client",RbSettings::TtsPath).toString();
|
QString path = RbSettings::subValue("festival-client",RbSettings::TtsPath).toString();
|
||||||
QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(path).arg(wavfile);
|
QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(path).arg(wavfile);
|
||||||
qDebug() << cmd;
|
qDebug() << cmd;
|
||||||
|
|
||||||
QProcess clientProcess;
|
QProcess clientProcess;
|
||||||
clientProcess.start(cmd);
|
clientProcess.start(cmd);
|
||||||
clientProcess.write(QString("%1.\n").arg(text).toAscii());
|
clientProcess.write(QString("%1.\n").arg(text).toAscii());
|
||||||
clientProcess.waitForBytesWritten();
|
clientProcess.waitForBytesWritten();
|
||||||
clientProcess.closeWriteChannel();
|
clientProcess.closeWriteChannel();
|
||||||
clientProcess.waitForReadyRead();
|
clientProcess.waitForReadyRead();
|
||||||
QString response = clientProcess.readAll();
|
QString response = clientProcess.readAll();
|
||||||
response = response.trimmed();
|
response = response.trimmed();
|
||||||
if(!response.contains("Utterance"))
|
if(!response.contains("Utterance"))
|
||||||
{
|
{
|
||||||
qDebug() << "Could not voice string: " << response;
|
qDebug() << "Could not voice string: " << response;
|
||||||
*errStr = tr("engine could not voice string");
|
*errStr = tr("engine could not voice string");
|
||||||
return Warning;
|
return Warning;
|
||||||
/* do not stop the voicing process because of a single string
|
/* do not stop the voicing process because of a single string
|
||||||
TODO: needs proper settings */
|
TODO: needs proper settings */
|
||||||
}
|
}
|
||||||
clientProcess.closeReadChannel(QProcess::StandardError);
|
clientProcess.closeReadChannel(QProcess::StandardError);
|
||||||
clientProcess.closeReadChannel(QProcess::StandardOutput);
|
clientProcess.closeReadChannel(QProcess::StandardOutput);
|
||||||
clientProcess.terminate();
|
clientProcess.terminate();
|
||||||
clientProcess.kill();
|
clientProcess.kill();
|
||||||
|
|
||||||
return NoError;
|
return NoError;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSFestival::configOk()
|
bool TTSFestival::configOk()
|
||||||
{
|
{
|
||||||
QString serverPath = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
QString serverPath = RbSettings::subValue("festival-server",RbSettings::TtsPath).toString();
|
||||||
QString clientPath = RbSettings::subValue("festival-client",RbSettings::TtsVoice).toString();
|
QString clientPath = RbSettings::subValue("festival-client",RbSettings::TtsVoice).toString();
|
||||||
|
|
||||||
bool ret = QFileInfo(serverPath).isExecutable() &&
|
bool ret = QFileInfo(serverPath).isExecutable() &&
|
||||||
QFileInfo(clientPath).isExecutable();
|
QFileInfo(clientPath).isExecutable();
|
||||||
if(RbSettings::subValue("festival",RbSettings::TtsVoice).toString().size() > 0 && voices.size() > 0)
|
if(RbSettings::subValue("festival",RbSettings::TtsVoice).toString().size() > 0 && voices.size() > 0)
|
||||||
ret = ret && (voices.indexOf(RbSettings::subValue("festival",RbSettings::TtsVoice).toString()) != -1);
|
ret = ret && (voices.indexOf(RbSettings::subValue("festival",RbSettings::TtsVoice).toString()) != -1);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList TTSFestival::getVoiceList(QString path)
|
QStringList TTSFestival::getVoiceList(QString path)
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return QStringList();
|
return QStringList();
|
||||||
|
|
||||||
if(voices.size() > 0)
|
if(voices.size() > 0)
|
||||||
{
|
{
|
||||||
qDebug() << "Using voice cache";
|
qDebug() << "Using voice cache";
|
||||||
return voices;
|
return voices;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString response = queryServer("(voice.list)",3000,path);
|
|
||||||
|
|
||||||
// get the 2nd line. It should be (<voice_name>, <voice_name>)
|
QString response = queryServer("(voice.list)",3000,path);
|
||||||
response = response.mid(response.indexOf('\n') + 1, -1);
|
|
||||||
response = response.left(response.indexOf('\n')).trimmed();
|
|
||||||
|
|
||||||
voices = response.mid(1, response.size()-2).split(' ');
|
// get the 2nd line. It should be (<voice_name>, <voice_name>)
|
||||||
|
response = response.mid(response.indexOf('\n') + 1, -1);
|
||||||
|
response = response.left(response.indexOf('\n')).trimmed();
|
||||||
|
|
||||||
voices.sort();
|
voices = response.mid(1, response.size()-2).split(' ');
|
||||||
if (voices.size() == 1 && voices[0].size() == 0)
|
|
||||||
voices.removeAt(0);
|
voices.sort();
|
||||||
if (voices.size() > 0)
|
if (voices.size() == 1 && voices[0].size() == 0)
|
||||||
qDebug() << "Voices: " << voices;
|
voices.removeAt(0);
|
||||||
else
|
if (voices.size() > 0)
|
||||||
qDebug() << "No voices.";
|
qDebug() << "Voices: " << voices;
|
||||||
|
else
|
||||||
return voices;
|
qDebug() << "No voices.";
|
||||||
|
|
||||||
|
return voices;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TTSFestival::getVoiceInfo(QString voice,QString path)
|
QString TTSFestival::getVoiceInfo(QString voice,QString path)
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
if(!getVoiceList().contains(voice))
|
if(!getVoiceList().contains(voice))
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
if(voiceDescriptions.contains(voice))
|
if(voiceDescriptions.contains(voice))
|
||||||
return voiceDescriptions[voice];
|
return voiceDescriptions[voice];
|
||||||
|
|
||||||
QString response = queryServer(QString("(voice.description '%1)").arg(voice), 3000,path);
|
|
||||||
|
|
||||||
if (response == "")
|
QString response = queryServer(QString("(voice.description '%1)").arg(voice), 3000,path);
|
||||||
{
|
|
||||||
voiceDescriptions[voice]=tr("No description available");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
response = response.remove(QRegExp("(description \"*\")", Qt::CaseInsensitive, QRegExp::Wildcard));
|
|
||||||
qDebug() << "voiceInfo w/o descr: " << response;
|
|
||||||
response = response.remove(')');
|
|
||||||
QStringList responseLines = response.split('(', QString::SkipEmptyParts);
|
|
||||||
responseLines.removeAt(0); // the voice name itself
|
|
||||||
|
|
||||||
QString description;
|
if (response == "")
|
||||||
foreach(QString line, responseLines)
|
{
|
||||||
{
|
voiceDescriptions[voice]=tr("No description available");
|
||||||
line = line.remove('(');
|
}
|
||||||
line = line.simplified();
|
else
|
||||||
|
{
|
||||||
|
response = response.remove(QRegExp("(description \"*\")", Qt::CaseInsensitive, QRegExp::Wildcard));
|
||||||
|
qDebug() << "voiceInfo w/o descr: " << response;
|
||||||
|
response = response.remove(')');
|
||||||
|
QStringList responseLines = response.split('(', QString::SkipEmptyParts);
|
||||||
|
responseLines.removeAt(0); // the voice name itself
|
||||||
|
|
||||||
line[0] = line[0].toUpper(); // capitalize the key
|
QString description;
|
||||||
|
foreach(QString line, responseLines)
|
||||||
|
{
|
||||||
|
line = line.remove('(');
|
||||||
|
line = line.simplified();
|
||||||
|
|
||||||
int firstSpace = line.indexOf(' ');
|
line[0] = line[0].toUpper(); // capitalize the key
|
||||||
if (firstSpace > 0)
|
|
||||||
{
|
|
||||||
line = line.insert(firstSpace, ':'); // add a colon between the key and the value
|
|
||||||
line[firstSpace+2] = line[firstSpace+2].toUpper(); // capitalize the value
|
|
||||||
}
|
|
||||||
|
|
||||||
description += line + "\n";
|
int firstSpace = line.indexOf(' ');
|
||||||
}
|
if (firstSpace > 0)
|
||||||
voiceDescriptions[voice] = description.trimmed();
|
{
|
||||||
}
|
line = line.insert(firstSpace, ':'); // add a colon between the key and the value
|
||||||
|
line[firstSpace+2] = line[firstSpace+2].toUpper(); // capitalize the value
|
||||||
return voiceDescriptions[voice];
|
}
|
||||||
|
|
||||||
|
description += line + "\n";
|
||||||
|
}
|
||||||
|
voiceDescriptions[voice] = description.trimmed();
|
||||||
|
}
|
||||||
|
|
||||||
|
return voiceDescriptions[voice];
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TTSFestival::queryServer(QString query, int timeout,QString path)
|
QString TTSFestival::queryServer(QString query, int timeout,QString path)
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
// this operation could take some time
|
// this operation could take some time
|
||||||
emit busy();
|
emit busy();
|
||||||
|
|
||||||
ensureServerRunning(path);
|
ensureServerRunning(path);
|
||||||
|
|
||||||
qDebug() << "queryServer with " << query;
|
qDebug() << "queryServer with " << query;
|
||||||
QString response;
|
QString response;
|
||||||
|
|
||||||
QDateTime endTime;
|
QDateTime endTime;
|
||||||
if(timeout > 0)
|
if(timeout > 0)
|
||||||
endTime = QDateTime::currentDateTime().addMSecs(timeout);
|
endTime = QDateTime::currentDateTime().addMSecs(timeout);
|
||||||
|
|
||||||
/* Festival is *extremely* unreliable. Although at this
|
/* Festival is *extremely* unreliable. Although at this
|
||||||
* point we are sure that SIOD is accepting commands,
|
* point we are sure that SIOD is accepting commands,
|
||||||
* we might end up with an empty response. Hence, the loop.
|
* we might end up with an empty response. Hence, the loop.
|
||||||
*/
|
*/
|
||||||
while(true)
|
while(true)
|
||||||
{
|
{
|
||||||
QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
|
QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
|
||||||
QTcpSocket socket;
|
QTcpSocket socket;
|
||||||
|
|
||||||
socket.connectToHost("localhost", 1314);
|
socket.connectToHost("localhost", 1314);
|
||||||
socket.waitForConnected();
|
socket.waitForConnected();
|
||||||
|
|
||||||
if(socket.state() == QAbstractSocket::ConnectedState)
|
if(socket.state() == QAbstractSocket::ConnectedState)
|
||||||
{
|
|
||||||
socket.write(QString("%1\n").arg(query).toAscii());
|
|
||||||
socket.waitForBytesWritten();
|
|
||||||
socket.waitForReadyRead();
|
|
||||||
|
|
||||||
response = socket.readAll().trimmed();
|
|
||||||
|
|
||||||
if (response != "LP" && response != "")
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
socket.abort();
|
|
||||||
socket.disconnectFromHost();
|
|
||||||
|
|
||||||
if(timeout > 0 && QDateTime::currentDateTime() >= endTime)
|
|
||||||
{
|
{
|
||||||
emit busyEnd();
|
socket.write(QString("%1\n").arg(query).toAscii());
|
||||||
return "";
|
socket.waitForBytesWritten();
|
||||||
|
socket.waitForReadyRead();
|
||||||
|
|
||||||
|
response = socket.readAll().trimmed();
|
||||||
|
|
||||||
|
if (response != "LP" && response != "")
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
/* make sure we wait a little as we don't want to flood the server with requests */
|
socket.abort();
|
||||||
QDateTime tmpEndTime = QDateTime::currentDateTime().addMSecs(500);
|
socket.disconnectFromHost();
|
||||||
while(QDateTime::currentDateTime() < tmpEndTime)
|
|
||||||
QCoreApplication::processEvents(QEventLoop::AllEvents);
|
if(timeout > 0 && QDateTime::currentDateTime() >= endTime)
|
||||||
}
|
{
|
||||||
if(response == "nil")
|
emit busyEnd();
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
/* make sure we wait a little as we don't want to flood the server with requests */
|
||||||
|
QDateTime tmpEndTime = QDateTime::currentDateTime().addMSecs(500);
|
||||||
|
while(QDateTime::currentDateTime() < tmpEndTime)
|
||||||
|
QCoreApplication::processEvents(QEventLoop::AllEvents);
|
||||||
|
}
|
||||||
|
if(response == "nil")
|
||||||
{
|
{
|
||||||
emit busyEnd();
|
emit busyEnd();
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList lines = response.split('\n');
|
QStringList lines = response.split('\n');
|
||||||
if(lines.size() > 2)
|
if(lines.size() > 2)
|
||||||
{
|
{
|
||||||
lines.removeFirst();
|
lines.removeFirst();
|
||||||
lines.removeLast();
|
lines.removeLast();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
qDebug() << "Response too short: " << response;
|
qDebug() << "Response too short: " << response;
|
||||||
|
|
||||||
emit busyEnd();
|
emit busyEnd();
|
||||||
return lines.join("\n");
|
return lines.join("\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue