summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/talkfile.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-05-02 18:40:04 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-05-02 18:40:04 +0000
commit7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d (patch)
tree9814a23e24cd9be26f0009835a463b5a9c097f7f /rbutil/rbutilqt/talkfile.cpp
parentb10ba5e8b34eaac0c4b72bcf3be3db180c43126a (diff)
downloadrockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.tar.gz
rockbox-7cfdd4758767e6c5a6fceb0cb5d12ef3b1c99b5d.zip
Clean up ProgressLogger state handling:
- use better names for member functions - don't emit aborted() when exiting a successful log git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20844 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/talkfile.cpp')
-rw-r--r--rbutil/rbutilqt/talkfile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index fd6f4a2109..d41cb4f440 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -47,7 +47,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
47 { 47 {
48 m_logger->addItem(errStr.trimmed(),LOGERROR); 48 m_logger->addItem(errStr.trimmed(),LOGERROR);
49 m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR); 49 m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR);
50 m_logger->abort(); 50 m_logger->setFinished();
51 return false; 51 return false;
52 } 52 }
53 53
@@ -58,7 +58,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
58 if(!m_enc->start()) 58 if(!m_enc->start())
59 { 59 {
60 m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR); 60 m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR);
61 m_logger->abort(); 61 m_logger->setFinished();
62 m_tts->stop(); 62 m_tts->stop();
63 return false; 63 return false;
64 } 64 }
@@ -147,7 +147,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
147 m_logger->addItem(tr("Finished creating Talk files"),LOGOK); 147 m_logger->addItem(tr("Finished creating Talk files"),LOGOK);
148 m_logger->setProgressMax(1); 148 m_logger->setProgressMax(1);
149 m_logger->setProgressValue(1); 149 m_logger->setProgressValue(1);
150 m_logger->abort(); 150 m_logger->setFinished();
151 151
152 return true; 152 return true;
153} 153}
@@ -182,7 +182,7 @@ void TalkFileCreator::doAbort(QStringList cleanupList)
182 cleanup(cleanupList); 182 cleanup(cleanupList);
183 m_logger->setProgressMax(1); 183 m_logger->setProgressMax(1);
184 m_logger->setProgressValue(0); 184 m_logger->setProgressValue(0);
185 m_logger->abort(); 185 m_logger->setFinished();
186 m_tts->stop(); 186 m_tts->stop();
187 m_enc->stop(); 187 m_enc->stop();
188} 188}