1 files changed, 248 insertions, 246 deletions

diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp
index 48555cc114..68f169e875 100644
--- a/rbutil/rbutilqt/tts.cpp
+++ b/rbutil/rbutilqt/tts.cpp
@@ -50,17 +50,17 @@ TTSBase* TTSBase::getTTS(QString ttsName)
     if(ttsName == "sapi")
     {
         tts = new TTSSapi();
-        ttsCache[ttsName] = tts; 
+        ttsCache[ttsName] = tts;
         return tts;
     }
-    else 
+    else
 #endif
 #if defined(Q_OS_LINUX)
     if (ttsName == "festival")
     {
-        tts = new TTSFestival();
-        ttsCache[ttsName] = tts;
-        return tts;
+        tts = new TTSFestival();
+        ttsCache[ttsName] = tts;
+        return tts;
     }
     else
 #endif
@@ -104,30 +104,30 @@ TTSBase::TTSBase(): QObject()
 TTSExes::TTSExes(QString name) : TTSBase()
 {
     m_name = name;
-    
+
     m_TemplateMap["espeak"] = "\"%exe\" %options -w \"%wavfile\" \"%text\"";
     m_TemplateMap["flite"] = "\"%exe\" %options -o \"%wavfile\" -t \"%text\"";
     m_TemplateMap["swift"] = "\"%exe\" %options -o \"%wavfile\" \"%text\"";
-       
+
 }
 
 void TTSExes::setCfg(RbSettings* sett)
 {
     // call function of base class
     TTSBase::setCfg(sett);
-    
+
     // if the config isnt OK, try to autodetect
     if(!configOk())
     {
         QString exepath;
-        //try autodetect tts   
+        //try autodetect tts
 #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
         QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts);
 #elif defined(Q_OS_WIN)
         QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts);
 #endif
         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;
 #if defined(Q_OS_WIN)
@@ -145,14 +145,14 @@ void TTSExes::setCfg(RbSettings* sett)
         settings->setTTSPath(m_name,exepath);
         settings->sync();
     }
-    
+
 }
 
 bool TTSExes::start(QString *errStr)
 {
     m_TTSexec = settings->ttsPath(m_name);
     m_TTSOpts = settings->ttsOptions(m_name);
-    
+
     m_TTSTemplate = m_TemplateMap.value(m_name);
 
     QFileInfo tts(m_TTSexec);
@@ -169,7 +169,7 @@ bool TTSExes::start(QString *errStr)
 
 TTSStatus TTSExes::voice(QString text,QString wavfile, QString *errStr)
 {
-        (void) errStr;
+    (void) errStr;
     QString execstring = m_TTSTemplate;
 
     execstring.replace("%exe",m_TTSexec);
@@ -187,7 +187,7 @@ void TTSExes::showCfg()
 #ifndef CONSOLE
     TTSExesGui gui;
 #else
-        TTSExesGuiCli gui;
+    TTSExesGuiCli gui;
 #endif
     gui.setCfg(settings);
     gui.showCfg(m_name);
@@ -196,10 +196,10 @@ void TTSExes::showCfg()
 bool TTSExes::configOk()
 {
     QString path = settings->ttsPath(m_name);
-    
+
     if (QFileInfo(path).exists())
         return true;
-  
+
     return false;
 }
 
@@ -215,24 +215,24 @@ TTSSapi::TTSSapi() : TTSBase()
 
 
 bool TTSSapi::start(QString *errStr)
-{    
+{
 
     m_TTSOpts = settings->ttsOptions("sapi");
     m_TTSLanguage =settings->ttsLang("sapi");
     m_TTSVoice=settings->ttsVoice("sapi");
     m_TTSSpeed=QString("%1").arg(settings->ttsSpeed("sapi"));
     m_sapi4 = settings->ttsUseSapi4();
-    
+
     QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
     QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
     m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
-    
+
     QFileInfo tts(m_TTSexec);
     if(!tts.exists())
     {
         *errStr = tr("Could not copy the Sapi-script");
         return false;
-    }    
+    }
     // create the voice process
     QString execstring = m_TTSTemplate;
     execstring.replace("%exe",m_TTSexec);
@@ -240,31 +240,31 @@ bool TTSSapi::start(QString *errStr)
     execstring.replace("%lang",m_TTSLanguage);
     execstring.replace("%voice",m_TTSVoice);
     execstring.replace("%speed",m_TTSSpeed);
-    
+
     if(m_sapi4)
         execstring.append(" /sapi4 ");
-    
-    qDebug() << "init" << execstring; 
+
+    qDebug() << "init" << execstring;
     voicescript = new QProcess(NULL);
     //connect(voicescript,SIGNAL(readyReadStandardError()),this,SLOT(error()));
-    
+
     voicescript->start(execstring);
     if(!voicescript->waitForStarted())
     {
         *errStr = tr("Could not start the Sapi-script");
         return false;
     }
-    
-    if(!voicescript->waitForReadyRead(300))  
+
+    if(!voicescript->waitForReadyRead(300))
     {
         *errStr = voicescript->readAllStandardError();
         if(*errStr != "")
-            return false;    
+            return false;
     }
-    
+
     voicestream = new QTextStream(voicescript);
     voicestream->setCodec("UTF16-LE");
-    
+
     return true;
 }
 
@@ -272,31 +272,31 @@ bool TTSSapi::start(QString *errStr)
 QStringList TTSSapi::getVoiceList(QString language)
 {
     QStringList result;
- 
+
     QFile::copy(":/builtin/sapi_voice.vbs",QDir::tempPath() + "/sapi_voice.vbs");
     m_TTSexec = QDir::tempPath() +"/sapi_voice.vbs";
-    
+
     QFileInfo tts(m_TTSexec);
     if(!tts.exists())
         return result;
-        
+
     // create the voice process
     QString execstring = "cscript //nologo \"%exe\" /language:%lang /listvoices";
     execstring.replace("%exe",m_TTSexec);
     execstring.replace("%lang",language);
-    
+
     if(settings->ttsUseSapi4())
         execstring.append(" /sapi4 ");
-    
-    qDebug() << "init" << execstring; 
+
+    qDebug() << "init" << execstring;
     voicescript = new QProcess(NULL);
     voicescript->start(execstring);
-    qDebug() << "wait for started"; 
+    qDebug() << "wait for started";
     if(!voicescript->waitForStarted())
         return result;
     voicescript->closeWriteChannel();
     voicescript->waitForReadyRead();
-    
+
     QString dataRaw = voicescript->readAllStandardError().data();
     result = dataRaw.split(",",QString::SkipEmptyParts);
     result.sort();
@@ -305,15 +305,16 @@ QStringList TTSSapi::getVoiceList(QString language)
     {
         result[i] = result.at(i).simplified();
     }
-    
-    
+
+
     delete voicescript;
-    QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner 
-                                                             |QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
-                                                             |QFile::ReadGroup  |QFile::WriteGroup      |QFile::ExeGroup
-                                                             |QFile::ReadOther  |QFile::WriteOther      |QFile::ExeOther );
+    QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",
+                         QFile::ReadOwner  |QFile::WriteOwner |QFile::ExeOwner
+                        |QFile::ReadUser   |QFile::WriteUser  |QFile::ExeUser
+                        |QFile::ReadGroup  |QFile::WriteGroup |QFile::ExeGroup
+                        |QFile::ReadOther  |QFile::WriteOther |QFile::ExeOther);
     QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
-    
+
     return result;
 }
 
@@ -321,7 +322,7 @@ QStringList TTSSapi::getVoiceList(QString language)
 
 TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
 {
-        (void) errStr;
+    (void) errStr;
     QString query = "SPEAK\t"+wavfile+"\t"+text+"\r\n";
     qDebug() << "voicing" << query;
     *voicestream << query;
@@ -332,17 +333,18 @@ TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
 }
 
 bool TTSSapi::stop()
-{   
-   
+{
+
     *voicestream << "QUIT\r\n";
     voicestream->flush();
     voicescript->waitForFinished();
     delete voicestream;
     delete voicescript;
-    QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner 
-                                                             |QFile::ReadUser| QFile::WriteUser| QFile::ExeUser
-                                                             |QFile::ReadGroup  |QFile::WriteGroup      |QFile::ExeGroup
-                                                             |QFile::ReadOther  |QFile::WriteOther      |QFile::ExeOther );
+    QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",
+                         QFile::ReadOwner |QFile::WriteOwner |QFile::ExeOwner
+                        |QFile::ReadUser  |QFile::WriteUser  |QFile::ExeUser
+                        |QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
+                        |QFile::ReadOther |QFile::WriteOther |QFile::ExeOther);
     QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
     return true;
 }
@@ -353,7 +355,7 @@ void TTSSapi::showCfg()
 #ifndef CONSOLE
     TTSSapiGui gui(this);
 #else
-        TTSSapiGuiCli gui(this);
+    TTSSapiGuiCli gui(this);
 #endif
     gui.setCfg(settings);
     gui.showCfg();
@@ -370,104 +372,104 @@ bool TTSSapi::configOk()
  **********************************************************************/
 TTSFestival::~TTSFestival()
 {
-        stop();
+    stop();
 }
 
 void TTSFestival::startServer()
 {
-        if(!configOk())
-                return;
+    if(!configOk())
+        return;
 
-        QStringList paths = settings->ttsPath("festival").split(":");
+    QStringList paths = settings->ttsPath("festival").split(":");
 
-        serverProcess.start(QString("%1 --server").arg(paths[0]));
-        serverProcess.waitForStarted();
+    serverProcess.start(QString("%1 --server").arg(paths[0]));
+    serverProcess.waitForStarted();
 
-        queryServer("(getpid)");
-        if(serverProcess.state() == QProcess::Running)
-                qDebug() << "Festival is up and running";
-        else
-                qDebug() << "Festival failed to start";
+    queryServer("(getpid)");
+    if(serverProcess.state() == QProcess::Running)
+        qDebug() << "Festival is up and running";
+    else
+        qDebug() << "Festival failed to start";
 }
 
 void TTSFestival::ensureServerRunning()
 {
-        if(serverProcess.state() != QProcess::Running)
-        {
-                // least common denominator for all the server startup code paths
-                QProgressDialog progressDialog(tr(""), tr(""), 0, 0);
-                progressDialog.setWindowTitle(tr("Starting festival"));
-                progressDialog.setModal(true);
-                progressDialog.setLabel(0);
-                progressDialog.setCancelButton(0);
-                progressDialog.show();
-
-                QApplication::processEvents(); // actually show the dialog
-
-                startServer();
-        }
+    if(serverProcess.state() != QProcess::Running)
+    {
+        // least common denominator for all the server startup code paths
+        QProgressDialog progressDialog(tr(""), tr(""), 0, 0);
+        progressDialog.setWindowTitle(tr("Starting festival"));
+        progressDialog.setModal(true);
+        progressDialog.setLabel(0);
+        progressDialog.setCancelButton(0);
+        progressDialog.show();
+
+        QApplication::processEvents(); // actually show the dialog
+
+        startServer();
+    }
 }
 
 bool TTSFestival::start(QString* errStr)
 {
-        (void) errStr;
-        ensureServerRunning();
-        if (!settings->ttsVoice("festival").isEmpty())
-                queryServer(QString("(voice.select '%1)").arg(settings->ttsVoice("festival")));
+    (void) errStr;
+    ensureServerRunning();
+    if (!settings->ttsVoice("festival").isEmpty())
+        queryServer(QString("(voice.select '%1)").arg(settings->ttsVoice("festival")));
 
-        return true;
+    return true;
 }
 
 bool TTSFestival::stop()
 {
-        serverProcess.terminate();
-        serverProcess.kill();
+    serverProcess.terminate();
+    serverProcess.kill();
 
-        return true;
+    return true;
 }
 
 TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr)
 {
-        qDebug() << text << "->" << wavfile;
-
-        QStringList paths = settings->ttsPath("festival").split(":");
-        QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(paths[1]).arg(wavfile);
-        qDebug() << cmd;
-
-        QProcess clientProcess;
-        clientProcess.start(cmd);
-        clientProcess.write(QString("%1.\n").arg(text).toAscii());
-        clientProcess.waitForBytesWritten();
-        clientProcess.closeWriteChannel();
-        clientProcess.waitForReadyRead();
-        QString response = clientProcess.readAll();
-        response = response.trimmed();
-        if(!response.contains("Utterance"))
-        {
-                qDebug() << "Could not voice string: " << response;
-                *errStr = tr("engine could not voice string");
-                return Warning;
-                /* do not stop the voicing process because of a single string
-                TODO: needs proper settings */
-        }
-        clientProcess.closeReadChannel(QProcess::StandardError);
-        clientProcess.closeReadChannel(QProcess::StandardOutput);
-        clientProcess.terminate();
-        clientProcess.kill();
-
-        return NoError;
+    qDebug() << text << "->" << wavfile;
+
+    QStringList paths = settings->ttsPath("festival").split(":");
+    QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp --output \"%2\" - ").arg(paths[1]).arg(wavfile);
+    qDebug() << cmd;
+
+    QProcess clientProcess;
+    clientProcess.start(cmd);
+    clientProcess.write(QString("%1.\n").arg(text).toAscii());
+    clientProcess.waitForBytesWritten();
+    clientProcess.closeWriteChannel();
+    clientProcess.waitForReadyRead();
+    QString response = clientProcess.readAll();
+    response = response.trimmed();
+    if(!response.contains("Utterance"))
+    {
+        qDebug() << "Could not voice string: " << response;
+        *errStr = tr("engine could not voice string");
+        return Warning;
+        /* do not stop the voicing process because of a single string
+        TODO: needs proper settings */
+    }
+    clientProcess.closeReadChannel(QProcess::StandardError);
+    clientProcess.closeReadChannel(QProcess::StandardOutput);
+    clientProcess.terminate();
+    clientProcess.kill();
+
+    return NoError;
 }
 
 bool TTSFestival::configOk()
 {
-        QStringList paths = settings->ttsPath("festival").split(":");
-        if(paths.size() != 2)
-                return false;
-        bool ret = QFileInfo(paths[0]).isExecutable() &&
-                QFileInfo(paths[1]).isExecutable();
-        if(settings->ttsVoice("festival").size() > 0 && voices.size() > 0)
-                ret = ret && (voices.indexOf(settings->ttsVoice("festival")) != -1);
-        return ret;
+    QStringList paths = settings->ttsPath("festival").split(":");
+    if(paths.size() != 2)
+        return false;
+    bool ret = QFileInfo(paths[0]).isExecutable() &&
+        QFileInfo(paths[1]).isExecutable();
+    if(settings->ttsVoice("festival").size() > 0 && voices.size() > 0)
+        ret = ret && (voices.indexOf(settings->ttsVoice("festival")) != -1);
+    return ret;
 }
 
 void TTSFestival::showCfg()
@@ -481,138 +483,138 @@ void TTSFestival::showCfg()
 
 QStringList TTSFestival::getVoiceList()
 {
-        if(!configOk())
-                return QStringList();
-
-        if(voices.size() > 0)
-        {
-                qDebug() << "Using voice cache";
-                return voices;
-        }
-        QString response = queryServer("(voice.list)");
-
-        // 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 = response.mid(1, response.size()-2).split(' ');
-
-        voices.sort();
-        if (voices.size() == 1 && voices[0].size() == 0)
-                voices.removeAt(0);
-        if (voices.size() > 0)
-                qDebug() << "Voices: " << voices;
-        else
-                qDebug() << "No voices.";
-        return voices;
+    if(!configOk())
+        return QStringList();
+
+    if(voices.size() > 0)
+    {
+        qDebug() << "Using voice cache";
+        return voices;
+    }
+    QString response = queryServer("(voice.list)");
+
+    // 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 = response.mid(1, response.size()-2).split(' ');
+
+    voices.sort();
+    if (voices.size() == 1 && voices[0].size() == 0)
+        voices.removeAt(0);
+    if (voices.size() > 0)
+        qDebug() << "Voices: " << voices;
+    else
+        qDebug() << "No voices.";
+    return voices;
 }
 
 QString TTSFestival::getVoiceInfo(QString voice)
 {
-        if(!configOk())
-                return "";
-
-        if(!getVoiceList().contains(voice))
-                return "";
-
-        if(voiceDescriptions.contains(voice))
-                return voiceDescriptions[voice];
-
-        QString response = queryServer(QString("(voice.description '%1)").arg(voice), 3000);
-
-        if (response == "")
-        {
-                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;
-                foreach(QString line, responseLines)
-                {
-                        line = line.remove('(');
-                        line = line.simplified();
-
-                        line[0] = line[0].toUpper(); // capitalize the key
-
-                        int firstSpace = line.indexOf(' ');
-                        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";
-                }
-                voiceDescriptions[voice] = description.trimmed();
-        }
-        return voiceDescriptions[voice];
+    if(!configOk())
+        return "";
+
+    if(!getVoiceList().contains(voice))
+        return "";
+
+    if(voiceDescriptions.contains(voice))
+        return voiceDescriptions[voice];
+
+    QString response = queryServer(QString("(voice.description '%1)").arg(voice), 3000);
+
+    if (response == "")
+    {
+        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;
+        foreach(QString line, responseLines)
+        {
+            line = line.remove('(');
+            line = line.simplified();
+
+            line[0] = line[0].toUpper(); // capitalize the key
+
+            int firstSpace = line.indexOf(' ');
+            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";
+        }
+        voiceDescriptions[voice] = description.trimmed();
+    }
+    return voiceDescriptions[voice];
 }
 
 QString TTSFestival::queryServer(QString query, int timeout)
 {
-        if(!configOk())
-                return "";
-
-        ensureServerRunning();
-
-        qDebug() << "queryServer with " << query;
-        QString response;
-
-        QDateTime endTime;
-        if(timeout > 0)
-                endTime = QDateTime::currentDateTime().addMSecs(timeout);
-
-        /* Festival is *extremely* unreliable. Although at this
-         * point we are sure that SIOD is accepting commands,
-         * we might end up with an empty response. Hence, the loop.
-         */
-        while(true)
-        {
-                QApplication::processEvents(QEventLoop::AllEvents, 50);
-                QTcpSocket socket;
-
-                socket.connectToHost("localhost", 1314);
-                socket.waitForConnected();
-
-                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)
-                        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)
-                        QApplication::processEvents(QEventLoop::AllEvents);
-        }
-        if(response == "nil")
-                return "";
-
-        QStringList lines = response.split('\n');
-        if(lines.size() > 2)
-        {
-                lines.removeFirst();
-                lines.removeLast();
-        }
-        else
-                qDebug() << "Response too short: " << response;
-        return lines.join("\n");
+    if(!configOk())
+        return "";
+
+    ensureServerRunning();
+
+    qDebug() << "queryServer with " << query;
+    QString response;
+
+    QDateTime endTime;
+    if(timeout > 0)
+        endTime = QDateTime::currentDateTime().addMSecs(timeout);
+
+    /* Festival is *extremely* unreliable. Although at this
+     * point we are sure that SIOD is accepting commands,
+     * we might end up with an empty response. Hence, the loop.
+     */
+    while(true)
+    {
+        QApplication::processEvents(QEventLoop::AllEvents, 50);
+        QTcpSocket socket;
+
+        socket.connectToHost("localhost", 1314);
+        socket.waitForConnected();
+
+        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)
+            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)
+            QApplication::processEvents(QEventLoop::AllEvents);
+    }
+    if(response == "nil")
+        return "";
+
+    QStringList lines = response.split('\n');
+    if(lines.size() > 2)
+    {
+        lines.removeFirst();
+        lines.removeLast();
+    }
+    else
+        qDebug() << "Response too short: " << response;
+    return lines.join("\n");
 }