devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code police:

Browse source 
- 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 2009-04-05 12:46:41 +00:00
parent f3af25f5b7
commit baef133f5f
6 changed files with 474 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

438
rbutil/rbutilqt/tts.cpp
View file

@ -50,17 +50,17 @@ TTSBase* TTSBase::getTTS(QString ttsName)
if(ttsName == "sapi") if(ttsName == "sapi")
{ {
tts = new TTSSapi(); tts = new TTSSapi();
ttsCache[ttsName] = tts; ttsCache[ttsName] = tts;
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(); tts = new TTSFestival();
ttsCache[ttsName] = tts; ttsCache[ttsName] = tts;
return tts; return tts;
} }
else else
#endif #endif
@ -104,30 +104,30 @@ TTSBase::TTSBase(): QObject()
TTSExes::TTSExes(QString name) : TTSBase() TTSExes::TTSExes(QString name) : TTSBase()
{ {
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::setCfg(RbSettings* sett) void TTSExes::setCfg(RbSettings* sett)
{ {
// call function of base class // call function of base class
TTSBase::setCfg(sett); TTSBase::setCfg(sett);
// if the config isnt OK, try to autodetect // if the config isnt OK, try to autodetect
if(!configOk()) if(!configOk())
{ {
QString exepath; QString exepath;
//try autodetect tts //try autodetect tts
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts); QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts);
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts); QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts);
#endif #endif
qDebug() << path; qDebug() << path;
for(int i = 0; i < path.size(); i++) for(int i = 0; i < path.size(); i++)
{ {
QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + m_name; QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + m_name;
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -145,14 +145,14 @@ void TTSExes::setCfg(RbSettings* sett)
settings->setTTSPath(m_name,exepath); settings->setTTSPath(m_name,exepath);
settings->sync(); settings->sync();
} }
} }
bool TTSExes::start(QString *errStr) bool TTSExes::start(QString *errStr)
{ {
m_TTSexec = settings->ttsPath(m_name); m_TTSexec = settings->ttsPath(m_name);
m_TTSOpts = settings->ttsOptions(m_name); m_TTSOpts = settings->ttsOptions(m_name);
m_TTSTemplate = m_TemplateMap.value(m_name); m_TTSTemplate = m_TemplateMap.value(m_name);
QFileInfo tts(m_TTSexec); QFileInfo tts(m_TTSexec);
@ -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);
@ -196,10 +196,10 @@ void TTSExes::showCfg()
bool TTSExes::configOk() bool TTSExes::configOk()
{ {
QString path = settings->ttsPath(m_name); QString path = settings->ttsPath(m_name);
if (QFileInfo(path).exists()) if (QFileInfo(path).exists())
return true; return true;
return false; return false;
} }
@ -215,24 +215,24 @@ TTSSapi::TTSSapi() : TTSBase()
bool TTSSapi::start(QString *errStr) bool TTSSapi::start(QString *errStr)
{ {
m_TTSOpts = settings->ttsOptions("sapi"); m_TTSOpts = settings->ttsOptions("sapi");
m_TTSLanguage =settings->ttsLang("sapi"); m_TTSLanguage =settings->ttsLang("sapi");
m_TTSVoice=settings->ttsVoice("sapi"); m_TTSVoice=settings->ttsVoice("sapi");
m_TTSSpeed=QString("%1").arg(settings->ttsSpeed("sapi")); m_TTSSpeed=QString("%1").arg(settings->ttsSpeed("sapi"));
m_sapi4 = settings->ttsUseSapi4(); m_sapi4 = settings->ttsUseSapi4();
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);
@ -240,31 +240,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;
} }
@ -272,31 +272,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(settings->ttsUseSapi4()) if(settings->ttsUseSapi4())
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);
result.sort(); result.sort();
@ -305,15 +305,16 @@ 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::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;
@ -332,17 +333,18 @@ 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::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");
} }

54
rbutil/rbutilqt/tts.h
View file

@ -19,7 +19,7 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef TTS_H #ifndef TTS_H
#define TTS_H #define TTS_H
@ -55,16 +55,16 @@ class TTSBase : public QObject
virtual bool configOk() { return false; } virtual bool configOk() { return false; }
virtual void setCfg(RbSettings* sett) { settings = sett; } virtual void setCfg(RbSettings* sett) { settings = sett; }
static TTSBase* getTTS(QString ttsname); static TTSBase* getTTS(QString ttsname);
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){}
private: private:
//inits the tts List //inits the tts List
static void initTTSList(); static void initTTSList();
@ -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);
@ -85,13 +85,13 @@ class TTSSapi : public TTSBase
virtual bool stop(); virtual bool stop();
virtual void showCfg(); virtual void showCfg();
virtual bool configOk(); virtual bool configOk();
QStringList getVoiceList(QString language); QStringList getVoiceList(QString language);
private: private:
QProcess* voicescript; QProcess* voicescript;
QTextStream* voicestream; QTextStream* voicestream;
QString defaultLanguage; QString defaultLanguage;
QString m_TTSexec; QString m_TTSexec;
QString m_TTSOpts; QString m_TTSOpts;
QString m_TTSTemplate; QString m_TTSTemplate;
@ -114,7 +114,7 @@ class TTSExes : public TTSBase
virtual bool configOk(); virtual bool configOk();
virtual void setCfg(RbSettings* sett); virtual void setCfg(RbSettings* sett);
private: private:
QString m_name; QString m_name;
QString m_TTSexec; QString m_TTSexec;
@ -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

219
rbutil/rbutilqt/ttsgui.cpp
View file

@ -16,13 +16,13 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "ttsgui.h" #include "ttsgui.h"
#include "rbsettings.h" #include "rbsettings.h"
#include "tts.h" #include "tts.h"
#include "browsedirtree.h" #include "browsedirtree.h"
TTSSapiGui::TTSSapiGui(TTSSapi* sapi,QDialog* parent) : QDialog(parent) TTSSapiGui::TTSSapiGui(TTSSapi* sapi,QDialog* parent) : QDialog(parent)
{ {
m_sapi= sapi; m_sapi= sapi;
@ -31,46 +31,46 @@ TTSSapiGui::TTSSapiGui(TTSSapi* sapi,QDialog* parent) : QDialog(parent)
connect(ui.reset,SIGNAL(clicked()),this,SLOT(reset())); connect(ui.reset,SIGNAL(clicked()),this,SLOT(reset()));
connect(ui.languagecombo,SIGNAL(currentIndexChanged(QString)),this,SLOT(updateVoices(QString))); connect(ui.languagecombo,SIGNAL(currentIndexChanged(QString)),this,SLOT(updateVoices(QString)));
connect(ui.usesapi4,SIGNAL(stateChanged(int)),this,SLOT(useSapi4Changed(int))); connect(ui.usesapi4,SIGNAL(stateChanged(int)),this,SLOT(useSapi4Changed(int)));
} }
void TTSSapiGui::showCfg() void TTSSapiGui::showCfg()
{ {
// try to get config from settings // try to get config from settings
ui.ttsoptions->setText(settings->ttsOptions("sapi")); ui.ttsoptions->setText(settings->ttsOptions("sapi"));
QString selLang = settings->ttsLang("sapi"); QString selLang = settings->ttsLang("sapi");
QString selVoice = settings->ttsVoice("sapi"); QString selVoice = settings->ttsVoice("sapi");
ui.speed->setValue(settings->ttsSpeed("sapi")); ui.speed->setValue(settings->ttsSpeed("sapi"));
if(settings->ttsUseSapi4()) if(settings->ttsUseSapi4())
ui.usesapi4->setCheckState(Qt::Checked); ui.usesapi4->setCheckState(Qt::Checked);
else else
ui.usesapi4->setCheckState(Qt::Unchecked); ui.usesapi4->setCheckState(Qt::Unchecked);
// fill in language combobox // fill in language combobox
QStringList languages = settings->allLanguages(); QStringList languages = settings->allLanguages();
languages.sort(); languages.sort();
ui.languagecombo->clear(); ui.languagecombo->clear();
ui.languagecombo->addItems(languages); ui.languagecombo->addItems(languages);
// set saved lang // set saved lang
ui.languagecombo->setCurrentIndex(ui.languagecombo->findText(selLang)); ui.languagecombo->setCurrentIndex(ui.languagecombo->findText(selLang));
// fill in voice combobox // fill in voice combobox
updateVoices(selLang); updateVoices(selLang);
// set saved lang // set saved lang
ui.voicecombo->setCurrentIndex(ui.voicecombo->findText(selVoice)); ui.voicecombo->setCurrentIndex(ui.voicecombo->findText(selVoice));
//show dialog //show dialog
this->exec(); this->exec();
} }
void TTSSapiGui::reset() void TTSSapiGui::reset()
{ {
ui.ttsoptions->setText(""); ui.ttsoptions->setText("");
ui.languagecombo->setCurrentIndex(ui.languagecombo->findText("english")); ui.languagecombo->setCurrentIndex(ui.languagecombo->findText("english"));
} }
@ -101,7 +101,7 @@ void TTSSapiGui::updateVoices(QString language)
{ {
QStringList Voices = m_sapi->getVoiceList(language); QStringList Voices = m_sapi->getVoiceList(language);
ui.voicecombo->clear(); ui.voicecombo->clear();
ui.voicecombo->addItems(Voices); ui.voicecombo->addItems(Voices);
} }
@ -114,7 +114,7 @@ void TTSSapiGui::useSapi4Changed(int)
// sync settings // sync settings
settings->sync(); settings->sync();
updateVoices(ui.languagecombo->currentText()); updateVoices(ui.languagecombo->currentText());
} }
TTSExesGui::TTSExesGui(QDialog* parent) : QDialog(parent) TTSExesGui::TTSExesGui(QDialog* parent) : QDialog(parent)
@ -129,7 +129,7 @@ TTSExesGui::TTSExesGui(QDialog* parent) : QDialog(parent)
void TTSExesGui::reset() void TTSExesGui::reset()
{ {
ui.ttspath->setText(""); ui.ttspath->setText("");
ui.ttsoptions->setText(""); ui.ttsoptions->setText("");
} }
void TTSExesGui::showCfg(QString name) void TTSExesGui::showCfg(QString name)
@ -137,12 +137,12 @@ void TTSExesGui::showCfg(QString name)
m_name = name; m_name = name;
// try to get config from settings // try to get config from settings
QString exepath =settings->ttsPath(m_name); QString exepath =settings->ttsPath(m_name);
ui.ttsoptions->setText(settings->ttsOptions(m_name)); ui.ttsoptions->setText(settings->ttsOptions(m_name));
ui.ttspath->setText(exepath); ui.ttspath->setText(exepath);
//show dialog //show dialog
this->exec(); this->exec();
} }
void TTSExesGui::accept(void) void TTSExesGui::accept(void)
@ -152,7 +152,7 @@ void TTSExesGui::accept(void)
settings->setTTSOptions(m_name,ui.ttsoptions->text()); settings->setTTSOptions(m_name,ui.ttsoptions->text());
// sync settings // sync settings
settings->sync(); settings->sync();
this->done(0); this->done(0);
} }
@ -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));
} }
} }

103
rbutil/rbutilqt/ttsgui.h
View file

@ -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 setCfg(RbSettings* sett){settings = sett;}
public slots:
virtual void accept(void); void showCfg();
virtual void reject(void); void setCfg(RbSettings* sett){settings = sett;}
virtual void reset(void); public slots:
void updateVoices(QString language);
void useSapi4Changed(int); virtual void accept(void);
private: virtual void reject(void);
Ui::SapiCfgFrm ui; virtual void reset(void);
RbSettings* settings; void updateVoices(QString language);
TTSSapi* m_sapi; void useSapi4Changed(int);
private:
Ui::SapiCfgFrm ui;
RbSettings* settings;
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 setCfg(RbSettings* sett){settings = sett;}
public slots: void showCfg(QString m_name);
virtual void accept(void); void setCfg(RbSettings* sett){settings = sett;}
virtual void reject(void);
virtual void reset(void); public slots:
void browse(void); virtual void accept(void);
private: virtual void reject(void);
Ui::TTSExesCfgFrm ui; virtual void reset(void);
RbSettings* settings; void browse(void);
QString m_name; private:
Ui::TTSExesCfgFrm ui;
RbSettings* settings;
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

110
rbutil/rbutilqt/voicefile.cpp
View file

@ -40,15 +40,15 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger)
m_abort = false; m_abort = false;
m_logger = logger; m_logger = logger;
m_logger->addItem(tr("Starting Voicefile generation"),LOGINFO); m_logger->addItem(tr("Starting Voicefile generation"),LOGINFO);
// test if tempdir exists // test if tempdir exists
if(!QDir(QDir::tempPath()+"/rbvoice/").exists()) if(!QDir(QDir::tempPath()+"/rbvoice/").exists())
{ {
QDir(QDir::tempPath()).mkdir("rbvoice"); QDir(QDir::tempPath()).mkdir("rbvoice");
} }
m_path = QDir::tempPath() + "/rbvoice/"; m_path = QDir::tempPath() + "/rbvoice/";
// read rockbox-info.txt // read rockbox-info.txt
RockboxInfo info(m_mountpoint); RockboxInfo info(m_mountpoint);
if(!info.open()) if(!info.open())
@ -58,18 +58,18 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger)
emit done(false); emit done(false);
return false; return false;
} }
QString target = info.target(); QString target = info.target();
QString features = info.features(); QString features = info.features();
QString version = info.version(); QString version = info.version();
version = version.left(version.indexOf("-")).remove(0,1); version = version.left(version.indexOf("-")).remove(0,1);
//prepare download url //prepare download url
QUrl genlangUrl = settings->genlangUrl() +"?lang=" +m_lang+"&t="+target+"&rev="+version+"&f="+features; QUrl genlangUrl = settings->genlangUrl() +"?lang=" +m_lang+"&t="+target+"&rev="+version+"&f="+features;
qDebug() << "downloading " << genlangUrl; qDebug() << "downloading " << genlangUrl;
//download the correct genlang output //download the correct genlang output
QTemporaryFile *downloadFile = new QTemporaryFile(this); QTemporaryFile *downloadFile = new QTemporaryFile(this);
downloadFile->open(); downloadFile->open();
filename = downloadFile->fileName(); filename = downloadFile->fileName();
@ -77,11 +77,11 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger)
// get the real file. // get the real file.
getter = new HttpGet(this); getter = new HttpGet(this);
getter->setFile(downloadFile); getter->setFile(downloadFile);
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_logger, SIGNAL(aborted()), getter, SLOT(abort())); connect(m_logger, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(genlangUrl); getter->getFile(genlangUrl);
return true; return true;
} }
@ -113,9 +113,9 @@ void VoiceFileCreator::downloadDone(bool error)
} }
else m_logger->addItem(tr("Download finished."),LOGOK); else m_logger->addItem(tr("Download finished."),LOGOK);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
m_logger->setProgressMax(0); m_logger->setProgressMax(0);
//open downloaded file //open downloaded file
QFile genlang(filename); QFile genlang(filename);
if(!genlang.open(QIODevice::ReadOnly)) if(!genlang.open(QIODevice::ReadOnly))
@ -124,12 +124,12 @@ void VoiceFileCreator::downloadDone(bool error)
m_logger->abort(); m_logger->abort();
emit done(false); emit done(false);
return; return;
} }
//tts //tts
m_tts = TTSBase::getTTS(settings->curTTS()); m_tts = TTSBase::getTTS(settings->curTTS());
m_tts->setCfg(settings); m_tts->setCfg(settings);
QString errStr; QString errStr;
if(!m_tts->start(&errStr)) if(!m_tts->start(&errStr))
{ {
@ -141,9 +141,9 @@ void VoiceFileCreator::downloadDone(bool error)
} }
// Encoder // Encoder
m_enc = EncBase::getEncoder(settings->curEncoder()); m_enc = EncBase::getEncoder(settings->curEncoder());
m_enc->setCfg(settings); m_enc->setCfg(settings);
if(!m_enc->start()) if(!m_enc->start())
{ {
m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR); m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR);
@ -155,15 +155,15 @@ void VoiceFileCreator::downloadDone(bool error)
QCoreApplication::processEvents(); QCoreApplication::processEvents();
connect(m_logger,SIGNAL(aborted()),this,SLOT(abort())); connect(m_logger,SIGNAL(aborted()),this,SLOT(abort()));
//read in downloaded file //read in downloaded file
QList<QPair<QString,QString> > voicepairs; QList<QPair<QString,QString> > voicepairs;
QTextStream in(&genlang); QTextStream in(&genlang);
in.setCodec("UTF-8"); in.setCodec("UTF-8");
QString id, voice; QString id, voice;
bool idfound = false; bool idfound = false;
bool voicefound=false; bool voicefound=false;
while (!in.atEnd()) while (!in.atEnd())
{ {
QString line = in.readLine(); QString line = in.readLine();
if(line.contains("id:")) //ID found if(line.contains("id:")) //ID found
@ -176,58 +176,58 @@ void VoiceFileCreator::downloadDone(bool error)
voice = line.remove("voice:").remove('"').trimmed(); voice = line.remove("voice:").remove('"').trimmed();
voicefound=true; voicefound=true;
} }
if(idfound && voicefound) if(idfound && voicefound)
{ {
voicepairs.append(QPair<QString,QString>(id,voice)); voicepairs.append(QPair<QString,QString>(id,voice));
idfound=false; idfound=false;
voicefound=false; voicefound=false;
} }
} }
genlang.close(); genlang.close();
// check for empty list // check for empty list
if(voicepairs.size() == 0) if(voicepairs.size() == 0)
{ {
m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR); m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR);
m_logger->abort(); m_logger->abort();
m_tts->stop(); m_tts->stop();
emit done(false); emit done(false);
return; return;
} }
m_logger->setProgressMax(voicepairs.size()); m_logger->setProgressMax(voicepairs.size());
m_logger->setProgressValue(0); m_logger->setProgressValue(0);
// create voice clips // create voice clips
QStringList mp3files; QStringList mp3files;
for(int i=0; i< voicepairs.size(); i++) for(int i=0; i< voicepairs.size(); i++)
{ {
if(m_abort) if(m_abort)
{ {
m_logger->addItem("aborted.",LOGERROR); m_logger->addItem("aborted.",LOGERROR);
m_logger->abort(); m_logger->abort();
m_tts->stop(); m_tts->stop();
emit done(false); emit done(false);
return; return;
} }
m_logger->setProgressValue(i); m_logger->setProgressValue(i);
QString wavname = m_path + "/" + voicepairs.at(i).first + ".wav"; QString wavname = m_path + "/" + voicepairs.at(i).first + ".wav";
QString toSpeak = voicepairs.at(i).second; QString toSpeak = voicepairs.at(i).second;
QString encodedname = m_path + "/" + voicepairs.at(i).first +".mp3"; QString encodedname = m_path + "/" + voicepairs.at(i).first +".mp3";
// todo PAUSE // todo PAUSE
if(voicepairs.at(i).first == "VOICE_PAUSE") if(voicepairs.at(i).first == "VOICE_PAUSE")
{ {
QFile::copy(":/builtin/builtin/VOICE_PAUSE.wav",m_path + "/VOICE_PAUSE.wav"); QFile::copy(":/builtin/builtin/VOICE_PAUSE.wav",m_path + "/VOICE_PAUSE.wav");
} }
else else
{ {
if(toSpeak == "") continue; if(toSpeak == "") continue;
m_logger->addItem(tr("creating ")+toSpeak,LOGINFO); m_logger->addItem(tr("creating ")+toSpeak,LOGINFO);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
@ -235,26 +235,26 @@ void VoiceFileCreator::downloadDone(bool error)
QString errStr; QString errStr;
m_tts->voice(toSpeak,wavname, &errStr); // generate wav m_tts->voice(toSpeak,wavname, &errStr); // generate wav
} }
// todo strip // todo strip
char buffer[255]; char buffer[255];
wavtrim((char*)qPrintable(wavname),m_wavtrimThreshold,buffer,255); wavtrim((char*)qPrintable(wavname),m_wavtrimThreshold,buffer,255);
// encode wav // encode wav
m_enc->encode(wavname,encodedname); m_enc->encode(wavname,encodedname);
// remove the wav file // remove the wav file
QFile::remove(wavname); QFile::remove(wavname);
// remember the mp3 file for later removing // remember the mp3 file for later removing
mp3files << encodedname; mp3files << encodedname;
} }
//make voicefile //make voicefile
FILE* ids2 = fopen(filename.toUtf8(), "r"); FILE* ids2 = fopen(filename.toUtf8(), "r");
if (ids2 == NULL) if (ids2 == NULL)
{ {
m_logger->addItem(tr("Error opening downloaded file"),LOGERROR); m_logger->addItem(tr("Error opening downloaded file"),LOGERROR);
m_logger->abort(); m_logger->abort();
emit done(false); emit done(false);
return; return;
@ -263,32 +263,32 @@ void VoiceFileCreator::downloadDone(bool error)
FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang + ".voice").toUtf8(), "wb"); FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang + ".voice").toUtf8(), "wb");
if (output == NULL) if (output == NULL)
{ {
m_logger->addItem(tr("Error opening output file"),LOGERROR); m_logger->addItem(tr("Error opening output file"),LOGERROR);
emit done(false); emit done(false);
return; return;
} }
voicefont(ids2,m_targetid,(char*)(const char*)m_path.toUtf8(), output); voicefont(ids2,m_targetid,(char*)(const char*)m_path.toUtf8(), output);
//remove .mp3 files //remove .mp3 files
for(int i=0;i< mp3files.size(); i++) for(int i=0;i< mp3files.size(); i++)
{ {
QFile::remove(mp3files.at(i)); QFile::remove(mp3files.at(i));
} }
// Add Voice file to the install log // Add Voice file to the install log
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);
installlog.beginGroup("selfcreated Voice"); installlog.beginGroup("selfcreated Voice");
installlog.setValue("/.rockbox/langs/" + m_lang + ".voice",QDate::currentDate().toString("yyyyMMdd")); installlog.setValue("/.rockbox/langs/" + m_lang + ".voice",QDate::currentDate().toString("yyyyMMdd"));
installlog.endGroup(); installlog.endGroup();
installlog.sync(); installlog.sync();
m_logger->setProgressMax(100); m_logger->setProgressMax(100);
m_logger->setProgressValue(100); m_logger->setProgressValue(100);
m_logger->addItem(tr("successfully created."),LOGOK); m_logger->addItem(tr("successfully created."),LOGOK);
m_logger->abort(); m_logger->abort();
emit done(true); emit done(true);
} }
void VoiceFileCreator::updateDataReadProgress(int read, int total) void VoiceFileCreator::updateDataReadProgress(int read, int total)

19
rbutil/rbutilqt/voicefile.h
View file

@ -45,39 +45,40 @@ public:
// set infos // set infos
void setSettings(RbSettings* sett) { settings = sett;} void setSettings(RbSettings* sett) { settings = sett;}
void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; } void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
void setTargetId(int id){m_targetid = id;} void setTargetId(int id){m_targetid = id;}
void setLang(QString name){m_lang =name;} void setLang(QString name){m_lang =name;}
void setWavtrimThreshold(int th){m_wavtrimThreshold = th;} void setWavtrimThreshold(int th){m_wavtrimThreshold = th;}
signals: signals:
void done(bool error); void done(bool error);
private slots: private slots:
void abort(); void abort();
void downloadDone(bool error); void downloadDone(bool error);
void updateDataReadProgress(int read, int total); void updateDataReadProgress(int read, int total);
private: private:
// ptr to encoder, tts and settings // ptr to encoder, tts and settings
TTSBase* m_tts; TTSBase* m_tts;
EncBase* m_enc; EncBase* m_enc;
RbSettings* settings; RbSettings* settings;
HttpGet *getter; HttpGet *getter;
QString filename; //the temporary file QString filename; //the temporary file
QString m_mountpoint; //mountpoint of the device QString m_mountpoint; //mountpoint of the device
QString m_path; //path where the wav and mp3 files are stored to QString m_path; //path where the wav and mp3 files are stored to
int m_targetid; //the target id int m_targetid; //the target id
QString m_lang; // the language which will be spoken QString m_lang; // the language which will be spoken
int m_wavtrimThreshold; int m_wavtrimThreshold;
ProgressloggerInterface* m_logger; ProgressloggerInterface* m_logger;
bool m_abort; bool m_abort;
}; };
#endif #endif