rbutil: added hindi and tagalog to the voice languages. Set correct defaults for rbspeex encoder and sapi tts. Resurect the non-recursive option for talkfile generation.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16249 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-02-09 12:28:12 +00:00
parent 952347decb
commit 5e1fbffc61
3 changed files with 12 additions and 6 deletions

View file

@ -288,7 +288,7 @@ QString RbSettings::ttsOptions(QString tts)
QString RbSettings::ttsVoice(QString tts)
{
userSettings->beginGroup(tts);
QString op = userSettings->value("ttsvoice").toString();
QString op = userSettings->value("ttsvoice","Microsoft Sam").toString();
userSettings->endGroup();
return op;
}
@ -302,7 +302,7 @@ int RbSettings::ttsSpeed(QString tts)
QString RbSettings::ttsLang(QString tts)
{
userSettings->beginGroup(tts);
QString op = userSettings->value("ttslanguage").toString();
QString op = userSettings->value("ttslanguage","english").toString();
userSettings->endGroup();
return op;
}
@ -332,14 +332,14 @@ double RbSettings::encoderQuality(QString enc)
int RbSettings::encoderComplexity(QString enc)
{
userSettings->beginGroup(enc);
int c = userSettings->value("complexity",1.f).toInt();
int c = userSettings->value("complexity",10).toInt();
userSettings->endGroup();
return c;
}
double RbSettings::encoderVolume(QString enc)
{
userSettings->beginGroup(enc);
double v = userSettings->value("volume",10).toDouble();
double v = userSettings->value("volume",1.f).toDouble();
userSettings->endGroup();
return v;
}

View file

@ -476,6 +476,7 @@ lang32=svenska
lang33=thai
lang34=turkce
lang35=wallisertitsch
lang36=hindi
lang37=tagalog

View file

@ -59,7 +59,12 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
connect(logger,SIGNAL(aborted()),this,SLOT(abort()));
m_logger->setProgressMax(0);
QDirIterator it(m_dir,QDirIterator::Subdirectories);
QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags;
if(m_recursive)
flags = QDirIterator::Subdirectories;
QDirIterator it(m_dir,flags);
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);
installlog.beginGroup("talkfiles");
// iterate over all entrys