forked from len0rd/rockbox
Code police:
- kill trailing whitespace - replace tabs by spaces git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20623 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling
parent
f3af25f5b7
commit
baef133f5f
6 changed files with 474 additions and 469 deletions
|
|
@ -58,9 +58,9 @@ TTSBase* TTSBase::getTTS(QString ttsName)
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
if (ttsName == "festival")
|
if (ttsName == "festival")
|
||||||
{
|
{
|
||||||
tts = new TTSFestival();
|
tts = new TTSFestival();
|
||||||
ttsCache[ttsName] = tts;
|
ttsCache[ttsName] = tts;
|
||||||
return tts;
|
return tts;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -169,7 +169,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);
|
||||||
|
|
@ -187,7 +187,7 @@ void TTSExes::showCfg()
|
||||||
#ifndef CONSOLE
|
#ifndef CONSOLE
|
||||||
TTSExesGui gui;
|
TTSExesGui gui;
|
||||||
#else
|
#else
|
||||||
TTSExesGuiCli gui;
|
TTSExesGuiCli gui;
|
||||||
#endif
|
#endif
|
||||||
gui.setCfg(settings);
|
gui.setCfg(settings);
|
||||||
gui.showCfg(m_name);
|
gui.showCfg(m_name);
|
||||||
|
|
@ -308,10 +308,11 @@ QStringList TTSSapi::getVoiceList(QString language)
|
||||||
|
|
||||||
|
|
||||||
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::ReadUser| QFile::WriteUser| QFile::ExeUser
|
QFile::ReadOwner |QFile::WriteOwner |QFile::ExeOwner
|
||||||
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
|QFile::ReadUser |QFile::WriteUser |QFile::ExeUser
|
||||||
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
||||||
|
|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 +322,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;
|
||||||
|
|
@ -339,10 +340,11 @@ bool TTSSapi::stop()
|
||||||
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::ReadUser| QFile::WriteUser| QFile::ExeUser
|
QFile::ReadOwner |QFile::WriteOwner |QFile::ExeOwner
|
||||||
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
|QFile::ReadUser |QFile::WriteUser |QFile::ExeUser
|
||||||
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther );
|
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|
||||||
|
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther);
|
||||||
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -353,7 +355,7 @@ void TTSSapi::showCfg()
|
||||||
#ifndef CONSOLE
|
#ifndef CONSOLE
|
||||||
TTSSapiGui gui(this);
|
TTSSapiGui gui(this);
|
||||||
#else
|
#else
|
||||||
TTSSapiGuiCli gui(this);
|
TTSSapiGuiCli gui(this);
|
||||||
#endif
|
#endif
|
||||||
gui.setCfg(settings);
|
gui.setCfg(settings);
|
||||||
gui.showCfg();
|
gui.showCfg();
|
||||||
|
|
@ -370,104 +372,104 @@ bool TTSSapi::configOk()
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
TTSFestival::~TTSFestival()
|
TTSFestival::~TTSFestival()
|
||||||
{
|
{
|
||||||
stop();
|
stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestival::startServer()
|
void TTSFestival::startServer()
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QStringList paths = settings->ttsPath("festival").split(":");
|
QStringList paths = settings->ttsPath("festival").split(":");
|
||||||
|
|
||||||
serverProcess.start(QString("%1 --server").arg(paths[0]));
|
serverProcess.start(QString("%1 --server").arg(paths[0]));
|
||||||
serverProcess.waitForStarted();
|
serverProcess.waitForStarted();
|
||||||
|
|
||||||
queryServer("(getpid)");
|
queryServer("(getpid)");
|
||||||
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()
|
void TTSFestival::ensureServerRunning()
|
||||||
{
|
{
|
||||||
if(serverProcess.state() != QProcess::Running)
|
if(serverProcess.state() != QProcess::Running)
|
||||||
{
|
{
|
||||||
// least common denominator for all the server startup code paths
|
// least common denominator for all the server startup code paths
|
||||||
QProgressDialog progressDialog(tr(""), tr(""), 0, 0);
|
QProgressDialog progressDialog(tr(""), tr(""), 0, 0);
|
||||||
progressDialog.setWindowTitle(tr("Starting festival"));
|
progressDialog.setWindowTitle(tr("Starting festival"));
|
||||||
progressDialog.setModal(true);
|
progressDialog.setModal(true);
|
||||||
progressDialog.setLabel(0);
|
progressDialog.setLabel(0);
|
||||||
progressDialog.setCancelButton(0);
|
progressDialog.setCancelButton(0);
|
||||||
progressDialog.show();
|
progressDialog.show();
|
||||||
|
|
||||||
QApplication::processEvents(); // actually show the dialog
|
QApplication::processEvents(); // actually show the dialog
|
||||||
|
|
||||||
startServer();
|
startServer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TTSFestival::start(QString* errStr)
|
bool TTSFestival::start(QString* errStr)
|
||||||
{
|
{
|
||||||
(void) errStr;
|
(void) errStr;
|
||||||
ensureServerRunning();
|
ensureServerRunning();
|
||||||
if (!settings->ttsVoice("festival").isEmpty())
|
if (!settings->ttsVoice("festival").isEmpty())
|
||||||
queryServer(QString("(voice.select '%1)").arg(settings->ttsVoice("festival")));
|
queryServer(QString("(voice.select '%1)").arg(settings->ttsVoice("festival")));
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
QStringList paths = settings->ttsPath("festival").split(":");
|
QStringList paths = settings->ttsPath("festival").split(":");
|
||||||
QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(paths[1]).arg(wavfile);
|
QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(paths[1]).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()
|
||||||
{
|
{
|
||||||
QStringList paths = settings->ttsPath("festival").split(":");
|
QStringList paths = settings->ttsPath("festival").split(":");
|
||||||
if(paths.size() != 2)
|
if(paths.size() != 2)
|
||||||
return false;
|
return false;
|
||||||
bool ret = QFileInfo(paths[0]).isExecutable() &&
|
bool ret = QFileInfo(paths[0]).isExecutable() &&
|
||||||
QFileInfo(paths[1]).isExecutable();
|
QFileInfo(paths[1]).isExecutable();
|
||||||
if(settings->ttsVoice("festival").size() > 0 && voices.size() > 0)
|
if(settings->ttsVoice("festival").size() > 0 && voices.size() > 0)
|
||||||
ret = ret && (voices.indexOf(settings->ttsVoice("festival")) != -1);
|
ret = ret && (voices.indexOf(settings->ttsVoice("festival")) != -1);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestival::showCfg()
|
void TTSFestival::showCfg()
|
||||||
|
|
@ -481,138 +483,138 @@ void TTSFestival::showCfg()
|
||||||
|
|
||||||
QStringList TTSFestival::getVoiceList()
|
QStringList TTSFestival::getVoiceList()
|
||||||
{
|
{
|
||||||
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)");
|
QString response = queryServer("(voice.list)");
|
||||||
|
|
||||||
// get the 2nd line. It should be (<voice_name>, <voice_name>)
|
// get the 2nd line. It should be (<voice_name>, <voice_name>)
|
||||||
response = response.mid(response.indexOf('\n') + 1, -1);
|
response = response.mid(response.indexOf('\n') + 1, -1);
|
||||||
response = response.left(response.indexOf('\n')).trimmed();
|
response = response.left(response.indexOf('\n')).trimmed();
|
||||||
|
|
||||||
voices = response.mid(1, response.size()-2).split(' ');
|
voices = response.mid(1, response.size()-2).split(' ');
|
||||||
|
|
||||||
voices.sort();
|
voices.sort();
|
||||||
if (voices.size() == 1 && voices[0].size() == 0)
|
if (voices.size() == 1 && voices[0].size() == 0)
|
||||||
voices.removeAt(0);
|
voices.removeAt(0);
|
||||||
if (voices.size() > 0)
|
if (voices.size() > 0)
|
||||||
qDebug() << "Voices: " << voices;
|
qDebug() << "Voices: " << voices;
|
||||||
else
|
else
|
||||||
qDebug() << "No voices.";
|
qDebug() << "No voices.";
|
||||||
return voices;
|
return voices;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TTSFestival::getVoiceInfo(QString voice)
|
QString TTSFestival::getVoiceInfo(QString voice)
|
||||||
{
|
{
|
||||||
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);
|
QString response = queryServer(QString("(voice.description '%1)").arg(voice), 3000);
|
||||||
|
|
||||||
if (response == "")
|
if (response == "")
|
||||||
{
|
{
|
||||||
voiceDescriptions[voice]=tr("No description available");
|
voiceDescriptions[voice]=tr("No description available");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
response = response.remove(QRegExp("(description \"*\")", Qt::CaseInsensitive, QRegExp::Wildcard));
|
response = response.remove(QRegExp("(description \"*\")", Qt::CaseInsensitive, QRegExp::Wildcard));
|
||||||
qDebug() << "voiceInfo w/o descr: " << response;
|
qDebug() << "voiceInfo w/o descr: " << response;
|
||||||
response = response.remove(')');
|
response = response.remove(')');
|
||||||
QStringList responseLines = response.split('(', QString::SkipEmptyParts);
|
QStringList responseLines = response.split('(', QString::SkipEmptyParts);
|
||||||
responseLines.removeAt(0); // the voice name itself
|
responseLines.removeAt(0); // the voice name itself
|
||||||
|
|
||||||
QString description;
|
QString description;
|
||||||
foreach(QString line, responseLines)
|
foreach(QString line, responseLines)
|
||||||
{
|
{
|
||||||
line = line.remove('(');
|
line = line.remove('(');
|
||||||
line = line.simplified();
|
line = line.simplified();
|
||||||
|
|
||||||
line[0] = line[0].toUpper(); // capitalize the key
|
line[0] = line[0].toUpper(); // capitalize the key
|
||||||
|
|
||||||
int firstSpace = line.indexOf(' ');
|
int firstSpace = line.indexOf(' ');
|
||||||
if (firstSpace > 0)
|
if (firstSpace > 0)
|
||||||
{
|
{
|
||||||
line = line.insert(firstSpace, ':'); // add a colon between the key and the value
|
line = line.insert(firstSpace, ':'); // add a colon between the key and the value
|
||||||
line[firstSpace+2] = line[firstSpace+2].toUpper(); // capitalize the value
|
line[firstSpace+2] = line[firstSpace+2].toUpper(); // capitalize the value
|
||||||
}
|
}
|
||||||
|
|
||||||
description += line + "\n";
|
description += line + "\n";
|
||||||
}
|
}
|
||||||
voiceDescriptions[voice] = description.trimmed();
|
voiceDescriptions[voice] = description.trimmed();
|
||||||
}
|
}
|
||||||
return voiceDescriptions[voice];
|
return voiceDescriptions[voice];
|
||||||
}
|
}
|
||||||
|
|
||||||
QString TTSFestival::queryServer(QString query, int timeout)
|
QString TTSFestival::queryServer(QString query, int timeout)
|
||||||
{
|
{
|
||||||
if(!configOk())
|
if(!configOk())
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
ensureServerRunning();
|
ensureServerRunning();
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
QApplication::processEvents(QEventLoop::AllEvents, 50);
|
QApplication::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.write(QString("%1\n").arg(query).toAscii());
|
||||||
socket.waitForBytesWritten();
|
socket.waitForBytesWritten();
|
||||||
socket.waitForReadyRead();
|
socket.waitForReadyRead();
|
||||||
|
|
||||||
response = socket.readAll().trimmed();
|
response = socket.readAll().trimmed();
|
||||||
|
|
||||||
if (response != "LP" && response != "")
|
if (response != "LP" && response != "")
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
socket.abort();
|
socket.abort();
|
||||||
socket.disconnectFromHost();
|
socket.disconnectFromHost();
|
||||||
|
|
||||||
if(timeout > 0 && QDateTime::currentDateTime() >= endTime)
|
if(timeout > 0 && QDateTime::currentDateTime() >= endTime)
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
/* make sure we wait a little as we don't want to flood the server with requests */
|
/* make sure we wait a little as we don't want to flood the server with requests */
|
||||||
QDateTime tmpEndTime = QDateTime::currentDateTime().addMSecs(500);
|
QDateTime tmpEndTime = QDateTime::currentDateTime().addMSecs(500);
|
||||||
while(QDateTime::currentDateTime() < tmpEndTime)
|
while(QDateTime::currentDateTime() < tmpEndTime)
|
||||||
QApplication::processEvents(QEventLoop::AllEvents);
|
QApplication::processEvents(QEventLoop::AllEvents);
|
||||||
}
|
}
|
||||||
if(response == "nil")
|
if(response == "nil")
|
||||||
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;
|
||||||
return lines.join("\n");
|
return lines.join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,8 @@ class TTSBase : public QObject
|
||||||
static QStringList getTTSList();
|
static QStringList getTTSList();
|
||||||
static QString getTTSName(QString tts);
|
static QString getTTSName(QString tts);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
virtual void accept(void){}
|
virtual void accept(void){}
|
||||||
virtual void reject(void){}
|
virtual void reject(void){}
|
||||||
virtual void reset(void){}
|
virtual void reset(void){}
|
||||||
|
|
||||||
|
|
@ -77,7 +77,7 @@ class TTSBase : public QObject
|
||||||
|
|
||||||
class TTSSapi : public TTSBase
|
class TTSSapi : public TTSBase
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
TTSSapi();
|
TTSSapi();
|
||||||
virtual TTSStatus voice(QString text,QString wavfile, QString *errStr);
|
virtual TTSStatus voice(QString text,QString wavfile, QString *errStr);
|
||||||
|
|
@ -125,24 +125,24 @@ class TTSExes : public TTSBase
|
||||||
|
|
||||||
class TTSFestival : public TTSBase
|
class TTSFestival : public TTSBase
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
~TTSFestival();
|
~TTSFestival();
|
||||||
virtual bool configOk();
|
virtual bool configOk();
|
||||||
virtual bool start(QString *errStr);
|
virtual bool start(QString *errStr);
|
||||||
virtual bool stop();
|
virtual bool stop();
|
||||||
virtual void showCfg();
|
virtual void showCfg();
|
||||||
virtual TTSStatus voice(QString text,QString wavfile, QString *errStr);
|
virtual TTSStatus voice(QString text,QString wavfile, QString *errStr);
|
||||||
|
|
||||||
QStringList getVoiceList();
|
QStringList getVoiceList();
|
||||||
QString getVoiceInfo(QString voice);
|
QString getVoiceInfo(QString voice);
|
||||||
private:
|
private:
|
||||||
inline void startServer();
|
inline void startServer();
|
||||||
inline void ensureServerRunning();
|
inline void ensureServerRunning();
|
||||||
QString queryServer(QString query, int timeout = -1);
|
QString queryServer(QString query, int timeout = -1);
|
||||||
QProcess serverProcess;
|
QProcess serverProcess;
|
||||||
QStringList voices;
|
QStringList voices;
|
||||||
QMap<QString, QString> voiceDescriptions;
|
QMap<QString, QString> voiceDescriptions;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ void TTSExesGui::browse()
|
||||||
}
|
}
|
||||||
|
|
||||||
TTSFestivalGui::TTSFestivalGui(TTSFestival* api, QDialog* parent) :
|
TTSFestivalGui::TTSFestivalGui(TTSFestival* api, QDialog* parent) :
|
||||||
QDialog(parent), festival(api)
|
QDialog(parent), festival(api)
|
||||||
{
|
{
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
this->setModal(true);
|
this->setModal(true);
|
||||||
|
|
@ -199,31 +199,31 @@ TTSFestivalGui::TTSFestivalGui(TTSFestival* api, QDialog* parent) :
|
||||||
|
|
||||||
void TTSFestivalGui::showCfg()
|
void TTSFestivalGui::showCfg()
|
||||||
{
|
{
|
||||||
qDebug() << "show\tpaths: " << settings->ttsPath("festival") << "\n"
|
qDebug() << "show\tpaths: " << settings->ttsPath("festival") << "\n"
|
||||||
<< "\tvoice: " << settings->ttsVoice("festival");
|
<< "\tvoice: " << settings->ttsVoice("festival");
|
||||||
|
|
||||||
// will populate the voices if the paths are correct,
|
// will populate the voices if the paths are correct,
|
||||||
// otherwise, it will require the user to press Refresh
|
// otherwise, it will require the user to press Refresh
|
||||||
updateVoices();
|
updateVoices();
|
||||||
|
|
||||||
// try to get config from settings
|
// try to get config from settings
|
||||||
QStringList paths = settings->ttsPath("festival").split(":");
|
QStringList paths = settings->ttsPath("festival").split(":");
|
||||||
if(paths.size() == 2)
|
if(paths.size() == 2)
|
||||||
{
|
{
|
||||||
ui.serverPath->setText(paths[0]);
|
ui.serverPath->setText(paths[0]);
|
||||||
ui.clientPath->setText(paths[1]);
|
ui.clientPath->setText(paths[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
this->setEnabled(true);
|
this->setEnabled(true);
|
||||||
this->exec();
|
this->exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::accept(void)
|
void TTSFestivalGui::accept(void)
|
||||||
{
|
{
|
||||||
//save settings in user config
|
//save settings in user config
|
||||||
QString newPath = QString("%1:%2").arg(ui.serverPath->text().trimmed()).arg(ui.clientPath->text().trimmed());
|
QString newPath = QString("%1:%2").arg(ui.serverPath->text().trimmed()).arg(ui.clientPath->text().trimmed());
|
||||||
qDebug() << "set\tpaths: " << newPath << "\n\tvoice: " << ui.voicesBox->currentText();
|
qDebug() << "set\tpaths: " << newPath << "\n\tvoice: " << ui.voicesBox->currentText();
|
||||||
settings->setTTSPath("festival", newPath);
|
settings->setTTSPath("festival", newPath);
|
||||||
settings->setTTSVoice("festival", ui.voicesBox->currentText());
|
settings->setTTSVoice("festival", ui.voicesBox->currentText());
|
||||||
|
|
||||||
settings->sync();
|
settings->sync();
|
||||||
|
|
@ -238,102 +238,103 @@ void TTSFestivalGui::reject(void)
|
||||||
|
|
||||||
void TTSFestivalGui::onBrowseClient()
|
void TTSFestivalGui::onBrowseClient()
|
||||||
{
|
{
|
||||||
BrowseDirtree browser(this);
|
BrowseDirtree browser(this);
|
||||||
browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
|
browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
|
||||||
|
|
||||||
QFileInfo currentPath(ui.clientPath->text().trimmed());
|
QFileInfo currentPath(ui.clientPath->text().trimmed());
|
||||||
if(currentPath.isDir())
|
if(currentPath.isDir())
|
||||||
{
|
{
|
||||||
browser.setDir(ui.clientPath->text());
|
browser.setDir(ui.clientPath->text());
|
||||||
}
|
}
|
||||||
else if (currentPath.isFile())
|
else if (currentPath.isFile())
|
||||||
{
|
{
|
||||||
browser.setDir(currentPath.dir().absolutePath());
|
browser.setDir(currentPath.dir().absolutePath());
|
||||||
}
|
}
|
||||||
if(browser.exec() == QDialog::Accepted)
|
if(browser.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
qDebug() << browser.getSelected();
|
qDebug() << browser.getSelected();
|
||||||
QString exe = browser.getSelected();
|
QString exe = browser.getSelected();
|
||||||
if(!QFileInfo(exe).isExecutable())
|
if(!QFileInfo(exe).isExecutable())
|
||||||
return;
|
return;
|
||||||
ui.clientPath->setText(exe);
|
ui.clientPath->setText(exe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::onBrowseServer()
|
void TTSFestivalGui::onBrowseServer()
|
||||||
{
|
{
|
||||||
BrowseDirtree browser(this);
|
BrowseDirtree browser(this);
|
||||||
browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
|
browser.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
|
||||||
|
|
||||||
QFileInfo currentPath(ui.serverPath->text().trimmed());
|
QFileInfo currentPath(ui.serverPath->text().trimmed());
|
||||||
if(currentPath.isDir())
|
if(currentPath.isDir())
|
||||||
{
|
{
|
||||||
browser.setDir(ui.serverPath->text());
|
browser.setDir(ui.serverPath->text());
|
||||||
}
|
}
|
||||||
else if (currentPath.isFile())
|
else if (currentPath.isFile())
|
||||||
{
|
{
|
||||||
browser.setDir(currentPath.dir().absolutePath());
|
browser.setDir(currentPath.dir().absolutePath());
|
||||||
}
|
}
|
||||||
if(browser.exec() == QDialog::Accepted)
|
if(browser.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
qDebug() << browser.getSelected();
|
qDebug() << browser.getSelected();
|
||||||
QString exe = browser.getSelected();
|
QString exe = browser.getSelected();
|
||||||
if(!QFileInfo(exe).isExecutable())
|
if(!QFileInfo(exe).isExecutable())
|
||||||
return;
|
return;
|
||||||
ui.serverPath->setText(exe);
|
ui.serverPath->setText(exe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::onRefreshButton()
|
void TTSFestivalGui::onRefreshButton()
|
||||||
{
|
{
|
||||||
/* Temporarily commit the settings so that we get the new path when we check for voices */
|
/* Temporarily commit the settings so that we get the new path when we check for voices */
|
||||||
QString newPath = QString("%1:%2").arg(ui.serverPath->text().trimmed()).arg(ui.clientPath->text().trimmed());
|
QString newPath = QString("%1:%2").arg(ui.serverPath->text().trimmed()).arg(ui.clientPath->text().trimmed());
|
||||||
QString oldPath = settings->ttsPath("festival");
|
QString oldPath = settings->ttsPath("festival");
|
||||||
qDebug() << "new path: " << newPath << "\n" << "old path: " << oldPath << "\nuse new: " << (newPath != oldPath);
|
qDebug() << "new path: " << newPath << "\n" << "old path: " << oldPath << "\nuse new: " << (newPath != oldPath);
|
||||||
|
|
||||||
if(newPath != oldPath)
|
if(newPath != oldPath)
|
||||||
{
|
{
|
||||||
qDebug() << "Using new paths for getVoiceList";
|
qDebug() << "Using new paths for getVoiceList";
|
||||||
settings->setTTSPath("festival", newPath);
|
settings->setTTSPath("festival", newPath);
|
||||||
settings->sync();
|
settings->sync();
|
||||||
}
|
}
|
||||||
|
|
||||||
updateVoices();
|
updateVoices();
|
||||||
|
|
||||||
if(newPath != oldPath)
|
if(newPath != oldPath)
|
||||||
{
|
{
|
||||||
settings->setTTSPath("festival", oldPath);
|
settings->setTTSPath("festival", oldPath);
|
||||||
settings->sync();
|
settings->sync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::onShowDescription(int state)
|
void TTSFestivalGui::onShowDescription(int state)
|
||||||
{
|
{
|
||||||
if(state == Qt::Unchecked)
|
if(state == Qt::Unchecked)
|
||||||
ui.descriptionLabel->setText("");
|
ui.descriptionLabel->setText("");
|
||||||
else
|
else
|
||||||
updateDescription(ui.voicesBox->currentText());
|
updateDescription(ui.voicesBox->currentText());
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::updateVoices()
|
void TTSFestivalGui::updateVoices()
|
||||||
{
|
{
|
||||||
ui.voicesBox->clear();
|
ui.voicesBox->clear();
|
||||||
ui.voicesBox->addItem(tr("Loading.."));
|
ui.voicesBox->addItem(tr("Loading.."));
|
||||||
|
|
||||||
QStringList voiceList = festival->getVoiceList();
|
QStringList voiceList = festival->getVoiceList();
|
||||||
ui.voicesBox->clear();
|
ui.voicesBox->clear();
|
||||||
ui.voicesBox->addItems(voiceList);
|
ui.voicesBox->addItems(voiceList);
|
||||||
|
|
||||||
ui.voicesBox->setCurrentIndex(ui.voicesBox->findText(settings->ttsVoice("festival")));
|
ui.voicesBox->setCurrentIndex(ui.voicesBox->findText(settings->ttsVoice("festival")));
|
||||||
|
|
||||||
updateDescription(settings->ttsVoice("festival"));
|
updateDescription(settings->ttsVoice("festival"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void TTSFestivalGui::updateDescription(QString value)
|
void TTSFestivalGui::updateDescription(QString value)
|
||||||
{
|
{
|
||||||
if(ui.showDescriptionCheckbox->checkState() == Qt::Checked)
|
if(ui.showDescriptionCheckbox->checkState() == Qt::Checked)
|
||||||
{
|
{
|
||||||
ui.descriptionLabel->setText(tr("Querying festival"));
|
ui.descriptionLabel->setText(tr("Querying festival"));
|
||||||
ui.descriptionLabel->setText(festival->getVoiceInfo(value));
|
ui.descriptionLabel->setText(festival->getVoiceInfo(value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,71 +34,72 @@ class TTSFestival;
|
||||||
|
|
||||||
class TTSSapiGui : public QDialog
|
class TTSSapiGui : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
TTSSapiGui(TTSSapi* sapi,QDialog* parent = NULL);
|
TTSSapiGui(TTSSapi* sapi,QDialog* parent = NULL);
|
||||||
|
|
||||||
void showCfg();
|
void showCfg();
|
||||||
void setCfg(RbSettings* sett){settings = sett;}
|
void setCfg(RbSettings* sett){settings = sett;}
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
virtual void accept(void);
|
virtual void accept(void);
|
||||||
virtual void reject(void);
|
virtual void reject(void);
|
||||||
virtual void reset(void);
|
virtual void reset(void);
|
||||||
void updateVoices(QString language);
|
void updateVoices(QString language);
|
||||||
void useSapi4Changed(int);
|
void useSapi4Changed(int);
|
||||||
private:
|
private:
|
||||||
Ui::SapiCfgFrm ui;
|
Ui::SapiCfgFrm ui;
|
||||||
RbSettings* settings;
|
RbSettings* settings;
|
||||||
TTSSapi* m_sapi;
|
TTSSapi* m_sapi;
|
||||||
};
|
};
|
||||||
|
|
||||||
class TTSExesGui : public QDialog
|
class TTSExesGui : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
TTSExesGui(QDialog* parent = NULL);
|
TTSExesGui(QDialog* parent = NULL);
|
||||||
|
|
||||||
void showCfg(QString m_name);
|
void showCfg(QString m_name);
|
||||||
void setCfg(RbSettings* sett){settings = sett;}
|
void setCfg(RbSettings* sett){settings = sett;}
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
virtual void accept(void);
|
virtual void accept(void);
|
||||||
virtual void reject(void);
|
virtual void reject(void);
|
||||||
virtual void reset(void);
|
virtual void reset(void);
|
||||||
void browse(void);
|
void browse(void);
|
||||||
private:
|
private:
|
||||||
Ui::TTSExesCfgFrm ui;
|
Ui::TTSExesCfgFrm ui;
|
||||||
RbSettings* settings;
|
RbSettings* settings;
|
||||||
QString m_name;
|
QString m_name;
|
||||||
};
|
};
|
||||||
|
|
||||||
class TTSFestivalGui : public QDialog
|
class TTSFestivalGui : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
TTSFestivalGui(TTSFestival* festival, QDialog* parent = NULL);
|
TTSFestivalGui(TTSFestival* festival, QDialog* parent = NULL);
|
||||||
|
|
||||||
void showCfg();
|
void showCfg();
|
||||||
void setCfg(RbSettings* sett){settings = sett;}
|
void setCfg(RbSettings* sett){settings = sett;}
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
virtual void accept(void);
|
virtual void accept(void);
|
||||||
virtual void reject(void);
|
virtual void reject(void);
|
||||||
//virtual void reset(void);
|
//virtual void reset(void);
|
||||||
|
|
||||||
void onRefreshButton();
|
void onRefreshButton();
|
||||||
void onShowDescription(int state);
|
void onShowDescription(int state);
|
||||||
void onBrowseServer();
|
void onBrowseServer();
|
||||||
void onBrowseClient();
|
void onBrowseClient();
|
||||||
private:
|
private:
|
||||||
Ui::TTSFestivalCfgFrm ui;
|
Ui::TTSFestivalCfgFrm ui;
|
||||||
RbSettings* settings;
|
RbSettings* settings;
|
||||||
TTSFestival* festival;
|
TTSFestival* festival;
|
||||||
|
|
||||||
void updateVoices();
|
void updateVoices();
|
||||||
private slots:
|
private slots:
|
||||||
void updateDescription(QString value);
|
void updateDescription(QString value);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,3 +81,4 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue