Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbutil: try to detect position of tts executeables without opening the config window.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18183 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-08-02 16:40:16 +00:00
parent 4c83ef1dbe
commit 85eb99211a
3 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
rbutil/rbutilqt/tts.cpp
View file

@ -97,6 +97,43 @@ TTSExes::TTSExes(QString name) : TTSBase()
}
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
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
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++)
{
QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + m_name;
#if defined(Q_OS_WIN)
executable += ".exe";
QStringList ex = executable.split("\"", QString::SkipEmptyParts);
executable = ex.join("");
#endif
qDebug() << executable;
if(QFileInfo(executable).isExecutable())
{
exepath= QDir::toNativeSeparators(executable);
break;
}
}
settings->setTTSPath(m_name,exepath);
settings->sync();
}
}
bool TTSExes::start(QString *errStr)
{
m_TTSexec = settings->ttsPath(m_name);

4
rbutil/rbutilqt/tts.h
View file

@ -46,7 +46,7 @@ class TTSBase : public QObject
virtual void showCfg(){}
virtual bool configOk() { return false; }
void setCfg(RbSettings* sett) { settings = sett; }
virtual void setCfg(RbSettings* sett) { settings = sett; }
static TTSBase* getTTS(QString ttsname);
static QStringList getTTSList();
@ -105,6 +105,8 @@ class TTSExes : public TTSBase
virtual void showCfg();
virtual bool configOk();
virtual void setCfg(RbSettings* sett);
private:
QString m_name;
QString m_TTSexec;

31
rbutil/rbutilqt/ttsgui.cpp
View file

@ -137,36 +137,7 @@ void TTSExesGui::showCfg(QString name)
m_name = name;
// try to get config from settings
QString exepath =settings->ttsPath(m_name);
ui.ttsoptions->setText(settings->ttsOptions(m_name));
if(exepath == "")
{
//try autodetect tts
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
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++)
{
QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + m_name;
#if defined(Q_OS_WIN)
executable += ".exe";
QStringList ex = executable.split("\"", QString::SkipEmptyParts);
executable = ex.join("");
#endif
qDebug() << executable;
if(QFileInfo(executable).isExecutable())
{
exepath= QDir::toNativeSeparators(executable);
break;
}
}
}
ui.ttsoptions->setText(settings->ttsOptions(m_name));
ui.ttspath->setText(exepath);
//show dialog