From 8820c0114b4ae30dc5ec8df90b0b1f10b720126e Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 12 Feb 2008 21:45:50 +0000 Subject: Make TTS name conversion functions static members. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16294 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/configure.cpp | 8 +-- rbutil/rbutilqt/createvoicewindow.cpp | 4 +- rbutil/rbutilqt/installtalkwindow.cpp | 4 +- rbutil/rbutilqt/talkfile.cpp | 2 +- rbutil/rbutilqt/tts.cpp | 20 +++--- rbutil/rbutilqt/tts.h | 126 +++++++++++++++++----------------- rbutil/rbutilqt/voicefile.cpp | 2 +- 7 files changed, 83 insertions(+), 83 deletions(-) diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 0e8486c68b..ec4bd188e5 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -299,9 +299,9 @@ void Config::setDevices() updateEncState(index); //tts - QStringList ttslist = getTTSList(); + QStringList ttslist = TTSBase::getTTSList(); for(int a = 0; a < ttslist.size(); a++) - ui.comboTts->addItem(getTTSName(ttslist.at(a)), ttslist.at(a)); + ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a)); //update index of combobox index = ui.comboTts->findData(settings->curTTS()); if(index < 0) index = 0; @@ -314,7 +314,7 @@ void Config::setDevices() void Config::updateTtsState(int index) { QString ttsName = ui.comboTts->itemData(index).toString(); - TTSBase* tts = getTTS(ttsName); + TTSBase* tts = TTSBase::getTTS(ttsName); tts->setCfg(settings); if(tts->configOk()) @@ -588,7 +588,7 @@ void Config::cacheClear() void Config::configTts() { int index = ui.comboTts->currentIndex(); - TTSBase* tts = getTTS(ui.comboTts->itemData(index).toString()); + TTSBase* tts = TTSBase::getTTS(ui.comboTts->itemData(index).toString()); tts->setCfg(settings); tts->showCfg(); diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 5375182fd9..768b1ae117 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp @@ -91,10 +91,10 @@ void CreateVoiceWindow::setSettings(RbSettings* sett) ui.comboLanguage->setCurrentIndex(sel); QString ttsName = settings->curTTS(); - TTSBase* tts = getTTS(ttsName); + TTSBase* tts = TTSBase::getTTS(ttsName); tts->setCfg(settings); if(tts->configOk()) - ui.labelTtsProfile->setText(tr("Selected TTS engine : %1").arg(getTTSName(ttsName))); + ui.labelTtsProfile->setText(tr("Selected TTS engine : %1").arg(TTSBase::getTTSName(ttsName))); else ui.labelTtsProfile->setText(tr("Selected TTS Engine: %1").arg("Invalid TTS configuration!")); diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 4fd1fb15f1..539374a07e 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp @@ -111,10 +111,10 @@ void InstallTalkWindow::setSettings(RbSettings* sett) settings = sett; QString ttsName = settings->curTTS(); - TTSBase* tts = getTTS(ttsName); + TTSBase* tts = TTSBase::getTTS(ttsName); tts->setCfg(settings); if(tts->configOk()) - ui.labelTtsProfile->setText(tr("Selected TTS engine : %1").arg(getTTSName(ttsName))); + ui.labelTtsProfile->setText(tr("Selected TTS engine : %1").arg(TTSBase::getTTSName(ttsName))); else ui.labelTtsProfile->setText(tr("Selected TTS Engine: %1").arg("Invalid TTS configuration!")); diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp index 3b4e82caf6..4390c430b9 100644 --- a/rbutil/rbutilqt/talkfile.cpp +++ b/rbutil/rbutilqt/talkfile.cpp @@ -31,7 +31,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) m_logger->addItem(tr("Starting Talk file generation"),LOGINFO); //tts - m_tts = getTTS(settings->curTTS()); + m_tts = TTSBase::getTTS(settings->curTTS()); m_tts->setCfg(settings); QString errStr; diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp index 1f40df003b..1cc6c20472 100644 --- a/rbutil/rbutilqt/tts.cpp +++ b/rbutil/rbutilqt/tts.cpp @@ -20,11 +20,12 @@ #include "tts.h" +// static variables +QMap TTSBase::ttsList; +QMap TTSBase::ttsCache; -static QMap ttsList; -static QMap ttsCache; - -void initTTSList() +// static functions +void TTSBase::initTTSList() { ttsList["espeak"] = "Espeak TTS Engine"; ttsList["flite"] = "Flite TTS Engine"; @@ -32,11 +33,11 @@ void initTTSList() #if defined(Q_OS_WIN) ttsList["sapi"] = "Sapi TTS Engine"; #endif - + } // function to get a specific encoder -TTSBase* getTTS(QString ttsName) +TTSBase* TTSBase::getTTS(QString ttsName) { // check cache if(ttsCache.contains(ttsName)) @@ -52,13 +53,13 @@ TTSBase* getTTS(QString ttsName) else { tts = new TTSExes(ttsName); - ttsCache[ttsName] = tts; + ttsCache[ttsName] = tts; return tts; } } // get the list of encoders, nice names -QStringList getTTSList() +QStringList TTSBase::getTTSList() { // init list if its empty if(ttsList.count() == 0) @@ -67,7 +68,8 @@ QStringList getTTSList() return ttsList.keys(); } -QString getTTSName(QString tts) +// get nice name of a specific tts +QString TTSBase::getTTSName(QString tts) { if(ttsList.isEmpty()) initTTSList(); diff --git a/rbutil/rbutilqt/tts.h b/rbutil/rbutilqt/tts.h index a5427fe05f..251b9b4c6a 100644 --- a/rbutil/rbutilqt/tts.h +++ b/rbutil/rbutilqt/tts.h @@ -31,86 +31,84 @@ #include "ttsguicli.h" #endif -class TTSBase; - -//inits the tts List -void initTTSList(); -// function to get a specific tts -TTSBase* getTTS(QString ttsname); -// get the list of tts, nice names -QStringList getTTSList(); -QString getTTSName(QString tts); - class TTSBase : public QObject { Q_OBJECT -public: - TTSBase(); - virtual bool voice(QString text,QString wavfile) {(void)text; (void)wavfile; return false;} - virtual bool start(QString *errStr){(void)errStr; return false;} - virtual bool stop(){return false;} - virtual void showCfg(){} - virtual bool configOk(){return false;} - - void setCfg(RbSettings* sett){settings = sett;} - -public slots: - virtual void accept(void){} - virtual void reject(void){} - virtual void reset(void){} + public: + TTSBase(); + virtual bool voice(QString text,QString wavfile) + { (void)text; (void)wavfile; return false; } + virtual bool start(QString *errStr) { (void)errStr; return false; } + virtual bool stop() { return false; } + virtual void showCfg(){} + virtual bool configOk() { return false; } -protected: - RbSettings* settings; + void setCfg(RbSettings* sett) { settings = sett; } + + static TTSBase* getTTS(QString ttsname); + static QStringList getTTSList(); + static QString getTTSName(QString tts); + + public slots: + virtual void accept(void){} + virtual void reject(void){} + virtual void reset(void){} + + private: + //inits the tts List + static void initTTSList(); + + protected: + RbSettings* settings; + static QMap ttsList; + static QMap ttsCache; }; class TTSSapi : public TTSBase { Q_OBJECT -public: - TTSSapi(); - virtual bool voice(QString text,QString wavfile); - virtual bool start(QString *errStr); - virtual bool stop(); - virtual void showCfg(); - virtual bool configOk(); - - QStringList getVoiceList(QString language); -private: - - QProcess* voicescript; - - QString defaultLanguage; + public: + TTSSapi(); + virtual bool voice(QString text,QString wavfile); + virtual bool start(QString *errStr); + virtual bool stop(); + virtual void showCfg(); + virtual bool configOk(); - QString m_TTSexec; - QString m_TTSOpts; - QString m_TTSTemplate; - QString m_TTSLanguage; - QString m_TTSVoice; - QString m_TTSSpeed; - bool m_sapi4; + QStringList getVoiceList(QString language); + private: + QProcess* voicescript; + + QString defaultLanguage; + + QString m_TTSexec; + QString m_TTSOpts; + QString m_TTSTemplate; + QString m_TTSLanguage; + QString m_TTSVoice; + QString m_TTSSpeed; + bool m_sapi4; }; + class TTSExes : public TTSBase { - Q_OBJECT -public: - TTSExes(QString name); - virtual bool voice(QString text,QString wavfile); - virtual bool start(QString *errStr); - virtual bool stop() {return true;} - virtual void showCfg(); - virtual bool configOk(); - - - -private: + Q_OBJECT + public: + TTSExes(QString name); + virtual bool voice(QString text,QString wavfile); + virtual bool start(QString *errStr); + virtual bool stop() {return true;} + virtual void showCfg(); + virtual bool configOk(); - QString m_name; - QString m_TTSexec; - QString m_TTSOpts; - QString m_TTSTemplate; - QMap m_TemplateMap; + private: + QString m_name; + QString m_TTSexec; + QString m_TTSOpts; + QString m_TTSTemplate; + QMap m_TemplateMap; }; #endif diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp index 290c298c26..208e134274 100644 --- a/rbutil/rbutilqt/voicefile.cpp +++ b/rbutil/rbutilqt/voicefile.cpp @@ -141,7 +141,7 @@ void VoiceFileCreator::downloadDone(bool error) } //tts - m_tts = getTTS(settings->curTTS()); + m_tts = TTSBase::getTTS(settings->curTTS()); m_tts->setCfg(settings); QString errStr; -- cgit v1.2.3