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

3 files changed, 12 insertions, 6 deletions

diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp
index 5b9dc6c0ad..51f7057cc2 100644
--- a/rbutil/rbutilqt/rbsettings.cpp
+++ b/rbutil/rbutilqt/rbsettings.cpp
@@ -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;
 }
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 562106ee15..5e5114c60c 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -476,6 +476,7 @@ lang32=svenska
 lang33=thai
 lang34=turkce
 lang35=wallisertitsch
-
+lang36=hindi
+lang37=tagalog
 
 
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index be3934de91..0df653b972 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -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