Implement simple run for non-multithreaded TTS.

Since setting the maximum number of threads to use to 1 causes sporadically
files missing add a simple alternative implementation that doesn't use futures.
This is a stop-gap solution to fix voice files not creating (reported on
Windows with SAPI voices, see FS#11994). Encoding doesn't seem to be affected
by the problem and is unchanged.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29762 a1c6a512-1295-4272-9138-f99709370657

rbutil/rbutilqt/base/talkgenerator.cpp

@@ -24,7 +24,7 @@
 
 TalkGenerator::TalkGenerator(QObject* parent): QObject(parent), encFutureWatcher(this), ttsFutureWatcher(this)
 {
-
+    m_userAborted = false;
 }
 
 //! \brief Creates Talkfiles.
@@ -126,9 +126,13 @@ TalkGenerator::Status TalkGenerator::voiceList(QList<TalkEntry>* list,int wavtri
     }
 
     /* If the engine can't be parallelized, we use only 1 thread */
+    // NOTE: setting the number of maximum threads to use to 1 doesn't seem to
+    // work as expected -- it causes sporadically output files missing (see
+    // FS#11994). As a stop-gap solution use a separate implementation in that
+    // case for running the TTS.
+    if((m_tts->capabilities() & TTSBase::RunInParallel) != 0)
+    {
         int maxThreadCount = QThreadPool::globalInstance()->maxThreadCount();
-    if ((m_tts->capabilities() & TTSBase::RunInParallel) == 0)
-        QThreadPool::globalInstance()->setMaxThreadCount(1);
         qDebug() << "[TalkGenerator] Maximum number of threads used:"
             << QThreadPool::globalInstance()->maxThreadCount();
 
@@ -152,6 +156,22 @@ TalkGenerator::Status TalkGenerator::voiceList(QList<TalkEntry>* list,int wavtri
         else
             return eOK;
     }
+    else {
+        qDebug() << "[TalkGenerator] Using single thread TTS workaround";
+        int items = list->size();
+        for(int i = 0; i < items; i++) {
+            if(m_userAborted) {
+                emit logItem(tr("Voicing aborted"), LOGERROR);
+                return eERROR;
+            }
+            TalkEntry entry = list->at(i);
+            TalkGenerator::ttsEntryPoint(entry);
+            (*list)[i] = entry;
+            emit logProgress(i, items);
+        }
+        return m_ttsWarnings ? eWARNING : eOK;
+    }
+}
 
 void TalkGenerator::ttsEntryPoint(TalkEntry& entry)
 {
@@ -279,5 +299,6 @@ void TalkGenerator::abort()
         encFutureWatcher.cancel();
         emit logItem(tr("Encoding aborted"), LOGERROR);
     }
+    m_userAborted = true;
 }
 

rbutil/rbutilqt/base/talkgenerator.h

@@ -94,6 +94,7 @@ private:
     EncBase* m_enc;
 
     bool m_ttsWarnings;
+    bool m_userAborted;
 };