summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/voicefile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base/voicefile.cpp')
-rw-r--r--rbutil/rbutilqt/base/voicefile.cpp19
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()
73 //download the correct genlang output 73 //download the correct genlang output
74 QTemporaryFile *downloadFile = new QTemporaryFile(this); 74 QTemporaryFile *downloadFile = new QTemporaryFile(this);
75 downloadFile->open(); 75 downloadFile->open();
76 filename = downloadFile->fileName(); 76 m_filename = downloadFile->fileName();
77 downloadFile->close(); 77 downloadFile->close();
78 // get the real file. 78 // get the real file.
79 getter = new HttpGet(this); 79 getter = new HttpGet(this);
@@ -100,8 +100,8 @@ void VoiceFileCreator::downloadDone(bool error)
100 emit done(true); 100 emit done(true);
101 return; 101 return;
102 } 102 }
103 103
104 if(getter->isCached()) 104 if(getter->isCached())
105 emit logItem(tr("Cached file used."), LOGINFO); 105 emit logItem(tr("Cached file used."), LOGINFO);
106 if(error) 106 if(error)
107 { 107 {
@@ -109,13 +109,18 @@ void VoiceFileCreator::downloadDone(bool error)
109 emit done(true); 109 emit done(true);
110 return; 110 return;
111 } 111 }
112 else 112 else
113 emit logItem(tr("Download finished."),LOGINFO); 113 emit logItem(tr("Download finished."),LOGINFO);
114 114
115 QCoreApplication::processEvents(); 115 QCoreApplication::processEvents();
116 create();
117}
118
116 119
120void VoiceFileCreator::create(void)
121{
117 //open downloaded file 122 //open downloaded file
118 QFile genlang(filename); 123 QFile genlang(m_filename);
119 if(!genlang.open(QIODevice::ReadOnly)) 124 if(!genlang.open(QIODevice::ReadOnly))
120 { 125 {
121 emit logItem(tr("failed to open downloaded file"),LOGERROR); 126 emit logItem(tr("failed to open downloaded file"),LOGERROR);
@@ -206,7 +211,7 @@ void VoiceFileCreator::downloadDone(bool error)
206 211
207 //make voicefile 212 //make voicefile
208 emit logItem(tr("Creating voicefiles..."),LOGINFO); 213 emit logItem(tr("Creating voicefiles..."),LOGINFO);
209 FILE* ids2 = fopen(filename.toLocal8Bit(), "r"); 214 FILE* ids2 = fopen(m_filename.toLocal8Bit(), "r");
210 if (ids2 == NULL) 215 if (ids2 == NULL)
211 { 216 {
212 cleanup(); 217 cleanup();