summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/voicefile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/voicefile.cpp')
-rw-r--r--rbutil/rbutilqt/voicefile.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp
index c38977af96..dd547773b8 100644
--- a/rbutil/rbutilqt/voicefile.cpp
+++ b/rbutil/rbutilqt/voicefile.cpp
@@ -54,7 +54,7 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger)
54 if(!info.open()) 54 if(!info.open())
55 { 55 {
56 m_logger->addItem(tr("could not find rockbox-info.txt"),LOGERROR); 56 m_logger->addItem(tr("could not find rockbox-info.txt"),LOGERROR);
57 m_logger->abort(); 57 m_logger->setFinished();
58 emit done(false); 58 emit done(false);
59 return false; 59 return false;
60 } 60 }
@@ -101,14 +101,14 @@ void VoiceFileCreator::downloadDone(bool error)
101 m_logger->setProgressValue(max); 101 m_logger->setProgressValue(max);
102 if(getter->httpResponse() != 200 && !getter->isCached()) { 102 if(getter->httpResponse() != 200 && !getter->isCached()) {
103 m_logger->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); 103 m_logger->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
104 m_logger->abort(); 104 m_logger->setFinished();
105 emit done(false); 105 emit done(false);
106 return; 106 return;
107 } 107 }
108 if(getter->isCached()) m_logger->addItem(tr("Cached file used."), LOGINFO); 108 if(getter->isCached()) m_logger->addItem(tr("Cached file used."), LOGINFO);
109 if(error) { 109 if(error) {
110 m_logger->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); 110 m_logger->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
111 m_logger->abort(); 111 m_logger->setFinished();
112 emit done(false); 112 emit done(false);
113 return; 113 return;
114 } 114 }
@@ -122,7 +122,7 @@ void VoiceFileCreator::downloadDone(bool error)
122 if(!genlang.open(QIODevice::ReadOnly)) 122 if(!genlang.open(QIODevice::ReadOnly))
123 { 123 {
124 m_logger->addItem(tr("failed to open downloaded file"),LOGERROR); 124 m_logger->addItem(tr("failed to open downloaded file"),LOGERROR);
125 m_logger->abort(); 125 m_logger->setFinished();
126 emit done(false); 126 emit done(false);
127 return; 127 return;
128 } 128 }
@@ -136,7 +136,7 @@ void VoiceFileCreator::downloadDone(bool error)
136 { 136 {
137 m_logger->addItem(errStr,LOGERROR); 137 m_logger->addItem(errStr,LOGERROR);
138 m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR); 138 m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR);
139 m_logger->abort(); 139 m_logger->setFinished();
140 emit done(false); 140 emit done(false);
141 return; 141 return;
142 } 142 }
@@ -149,7 +149,7 @@ void VoiceFileCreator::downloadDone(bool error)
149 { 149 {
150 m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR); 150 m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR);
151 m_tts->stop(); 151 m_tts->stop();
152 m_logger->abort(); 152 m_logger->setFinished();
153 emit done(false); 153 emit done(false);
154 return; 154 return;
155 } 155 }
@@ -191,7 +191,7 @@ void VoiceFileCreator::downloadDone(bool error)
191 if(voicepairs.size() == 0) 191 if(voicepairs.size() == 0)
192 { 192 {
193 m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR); 193 m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR);
194 m_logger->abort(); 194 m_logger->setFinished();
195 m_tts->stop(); 195 m_tts->stop();
196 emit done(false); 196 emit done(false);
197 return; 197 return;
@@ -207,7 +207,7 @@ void VoiceFileCreator::downloadDone(bool error)
207 if(m_abort) 207 if(m_abort)
208 { 208 {
209 m_logger->addItem("aborted.",LOGERROR); 209 m_logger->addItem("aborted.",LOGERROR);
210 m_logger->abort(); 210 m_logger->setFinished();
211 m_tts->stop(); 211 m_tts->stop();
212 emit done(false); 212 emit done(false);
213 return; 213 return;
@@ -256,7 +256,7 @@ void VoiceFileCreator::downloadDone(bool error)
256 if (ids2 == NULL) 256 if (ids2 == NULL)
257 { 257 {
258 m_logger->addItem(tr("Error opening downloaded file"),LOGERROR); 258 m_logger->addItem(tr("Error opening downloaded file"),LOGERROR);
259 m_logger->abort(); 259 m_logger->setFinished();
260 emit done(false); 260 emit done(false);
261 return; 261 return;
262 } 262 }
@@ -287,7 +287,7 @@ void VoiceFileCreator::downloadDone(bool error)
287 m_logger->setProgressMax(100); 287 m_logger->setProgressMax(100);
288 m_logger->setProgressValue(100); 288 m_logger->setProgressValue(100);
289 m_logger->addItem(tr("successfully created."),LOGOK); 289 m_logger->addItem(tr("successfully created."),LOGOK);
290 m_logger->abort(); 290 m_logger->setFinished();
291 291
292 emit done(true); 292 emit done(true);
293} 293}