diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/talkgenerator.cpp | 13 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.cpp | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/rbutil/rbutilqt/base/talkgenerator.cpp index 6dc0cebc19..ecb39cad2f 100644 --- a/rbutil/rbutilqt/base/talkgenerator.cpp +++ b/rbutil/rbutilqt/base/talkgenerator.cpp | |||
@@ -145,7 +145,8 @@ TalkGenerator::Status TalkGenerator::voiceList(QList<TalkEntry>* list,int wavtri | |||
145 | 145 | ||
146 | // voice entry | 146 | // voice entry |
147 | QString error; | 147 | QString error; |
148 | qDebug() << "[TalkGenerator] voicing: " << list->at(i).toSpeak << "to" << list->at(i).wavfilename; | 148 | qDebug() << "[TalkGenerator] voicing: " << list->at(i).toSpeak |
149 | << "to" << list->at(i).wavfilename; | ||
149 | TTSStatus status = m_tts->voice(list->at(i).toSpeak,list->at(i).wavfilename, &error); | 150 | TTSStatus status = m_tts->voice(list->at(i).toSpeak,list->at(i).wavfilename, &error); |
150 | if(status == Warning) | 151 | if(status == Warning) |
151 | { | 152 | { |
@@ -162,11 +163,17 @@ TalkGenerator::Status TalkGenerator::voiceList(QList<TalkEntry>* list,int wavtri | |||
162 | else | 163 | else |
163 | (*list)[i].voiced = true; | 164 | (*list)[i].voiced = true; |
164 | 165 | ||
165 | //wavetrim if needed | 166 | // wavtrim if needed |
166 | if(wavtrimth != -1) | 167 | if(wavtrimth != -1) |
167 | { | 168 | { |
168 | char buffer[255]; | 169 | char buffer[255]; |
169 | wavtrim(list->at(i).wavfilename.toLocal8Bit().data(),wavtrimth,buffer,255); | 170 | if(wavtrim(list->at(i).wavfilename.toLocal8Bit().data(), |
171 | wavtrimth, buffer, 255)) | ||
172 | { | ||
173 | qDebug() << "[TalkGenerator] wavtrim returned error on" | ||
174 | << list->at(i).wavfilename; | ||
175 | return eERROR; | ||
176 | } | ||
170 | } | 177 | } |
171 | 178 | ||
172 | emit logProgress(++m_progress,progressMax); | 179 | emit logProgress(++m_progress,progressMax); |
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp index ebabf9e8f6..2cc9f18c25 100644 --- a/rbutil/rbutilqt/base/voicefile.cpp +++ b/rbutil/rbutilqt/base/voicefile.cpp | |||
@@ -187,7 +187,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
187 | connect(&generator,SIGNAL(logProgress(int,int)),this,SIGNAL(logProgress(int,int))); | 187 | connect(&generator,SIGNAL(logProgress(int,int)),this,SIGNAL(logProgress(int,int))); |
188 | connect(this,SIGNAL(aborted()),&generator,SLOT(abort())); | 188 | connect(this,SIGNAL(aborted()),&generator,SLOT(abort())); |
189 | 189 | ||
190 | if(generator.process(&m_talkList) == TalkGenerator::eERROR) | 190 | if(generator.process(&m_talkList, m_wavtrimThreshold) == TalkGenerator::eERROR) |
191 | { | 191 | { |
192 | cleanup(); | 192 | cleanup(); |
193 | emit logProgress(0,1); | 193 | emit logProgress(0,1); |