summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-17 20:18:47 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-17 20:19:59 +0100
commit633749ea61585940f8a003aab9c9db9afb96a030 (patch)
tree6435614861d6969657125f729c94b7823a431e24 /rbutil/rbutilqt
parent6e11289cc2478c2d7414399cb8a3b9ed1ce7a6c9 (diff)
downloadrockbox-633749ea61585940f8a003aab9c9db9afb96a030.tar.gz
rockbox-633749ea61585940f8a003aab9c9db9afb96a030.zip
TTS: check if created wav file exists.
Instead of simply assuming the wav file that is supposed to be created by the TTS engine check if the file actually exists and return an error if not. Change-Id: I9e4a85a061b44b48931614602683b1dfe7dfce67
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/ttsexes.cpp7
-rw-r--r--rbutil/rbutilqt/base/ttssapi.cpp4
2 files changed, 10 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/ttsexes.cpp b/rbutil/rbutilqt/base/ttsexes.cpp
index 6766af4bb6..5e06b950bd 100644
--- a/rbutil/rbutilqt/base/ttsexes.cpp
+++ b/rbutil/rbutilqt/base/ttsexes.cpp
@@ -83,8 +83,13 @@ TTSStatus TTSExes::voice(QString text,QString wavfile, QString *errStr)
83 execstring.replace("%options",m_TTSOpts); 83 execstring.replace("%options",m_TTSOpts);
84 execstring.replace("%wavfile",wavfile); 84 execstring.replace("%wavfile",wavfile);
85 execstring.replace("%text",text); 85 execstring.replace("%text",text);
86 //qDebug() << "voicing" << execstring; 86
87 QProcess::execute(execstring); 87 QProcess::execute(execstring);
88
89 if(!QFileInfo(wavfile).isFile()) {
90 qDebug() << "[TTSExes] output file does not exist:" << wavfile;
91 return FatalError;
92 }
88 return NoError; 93 return NoError;
89 94
90} 95}
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index b5e6a69624..4ca82a798b 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -233,6 +233,10 @@ TTSStatus TTSSapi::voice(QString text,QString wavfile, QString *errStr)
233 while( voicescript->readLine(temp,20) == 0) 233 while( voicescript->readLine(temp,20) == 0)
234 QCoreApplication::processEvents(); 234 QCoreApplication::processEvents();
235 235
236 if(!QFileInfo(wavfile).isFile()) {
237 qDebug() << "[TTSExes] output file does not exist:" << wavfile;
238 return FatalError;
239 }
236 return NoError; 240 return NoError;
237} 241}
238 242