diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-05-25 23:01:45 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-05-27 22:57:17 +0200 |
commit | 112b80b0c2f0ea27f16c23699867554f66c31938 (patch) | |
tree | 6eed521372191133fc1fb696a081448a6ac1b2e3 /rbutil/rbutilqt/base/voicefile.cpp | |
parent | ad3ecfcf8cb6b37f48a2aeaf24c408907c927bb4 (diff) | |
download | rockbox-112b80b0c2f0ea27f16c23699867554f66c31938.tar.gz rockbox-112b80b0c2f0ea27f16c23699867554f66c31938.zip |
VoiceCreator: Factor out creation to separate function.
Change-Id: I83d1a08745acc88aa673d07e469a0a854ef97050
Diffstat (limited to 'rbutil/rbutilqt/base/voicefile.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp index 095f63d38b..bbb703bc3d 100644 --- a/rbutil/rbutilqt/base/voicefile.cpp +++ b/rbutil/rbutilqt/base/voicefile.cpp @@ -73,7 +73,7 @@ bool VoiceFileCreator::createVoiceFile() //download the correct genlang output QTemporaryFile *downloadFile = new QTemporaryFile(this); downloadFile->open(); - filename = downloadFile->fileName(); + m_filename = downloadFile->fileName(); downloadFile->close(); // get the real file. getter = new HttpGet(this); @@ -100,8 +100,8 @@ void VoiceFileCreator::downloadDone(bool error) emit done(true); return; } - - if(getter->isCached()) + + if(getter->isCached()) emit logItem(tr("Cached file used."), LOGINFO); if(error) { @@ -109,13 +109,18 @@ void VoiceFileCreator::downloadDone(bool error) emit done(true); return; } - else + else emit logItem(tr("Download finished."),LOGINFO); - + QCoreApplication::processEvents(); + create(); +} + +void VoiceFileCreator::create(void) +{ //open downloaded file - QFile genlang(filename); + QFile genlang(m_filename); if(!genlang.open(QIODevice::ReadOnly)) { emit logItem(tr("failed to open downloaded file"),LOGERROR); @@ -206,7 +211,7 @@ void VoiceFileCreator::downloadDone(bool error) //make voicefile emit logItem(tr("Creating voicefiles..."),LOGINFO); - FILE* ids2 = fopen(filename.toLocal8Bit(), "r"); + FILE* ids2 = fopen(m_filename.toLocal8Bit(), "r"); if (ids2 == NULL) { cleanup(); |