devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

VoiceCreator: Factor out creation to separate function.

Browse source 
Change-Id: I83d1a08745acc88aa673d07e469a0a854ef97050
This commit is contained in:
Dominik Riebeling 2012-05-25 23:01:45 +02:00
parent ad3ecfcf8c
commit 112b80b0c2
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rbutil/rbutilqt/base/voicefile.cpp
View file

@ -73,7 +73,7 @@ bool VoiceFileCreator::createVoiceFile()
//download the correct genlang output //download the correct genlang output
QTemporaryFile *downloadFile = new QTemporaryFile(this); QTemporaryFile *downloadFile = new QTemporaryFile(this);
downloadFile->open(); downloadFile->open();
filename = downloadFile->fileName(); m_filename = downloadFile->fileName();
downloadFile->close(); downloadFile->close();
// get the real file. // get the real file.
getter = new HttpGet(this); getter = new HttpGet(this);
@ -100,8 +100,8 @@ void VoiceFileCreator::downloadDone(bool error)
emit done(true); emit done(true);
return; return;
} }
if(getter->isCached()) if(getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO); emit logItem(tr("Cached file used."), LOGINFO);
if(error) if(error)
{ {
@ -109,13 +109,18 @@ void VoiceFileCreator::downloadDone(bool error)
emit done(true); emit done(true);
return; return;
} }
else else
emit logItem(tr("Download finished."),LOGINFO); emit logItem(tr("Download finished."),LOGINFO);
QCoreApplication::processEvents();
QCoreApplication::processEvents();
create();
}
void VoiceFileCreator::create(void)
{
//open downloaded file //open downloaded file
QFile genlang(filename); QFile genlang(m_filename);
if(!genlang.open(QIODevice::ReadOnly)) if(!genlang.open(QIODevice::ReadOnly))
{ {
emit logItem(tr("failed to open downloaded file"),LOGERROR); emit logItem(tr("failed to open downloaded file"),LOGERROR);
@ -206,7 +211,7 @@ void VoiceFileCreator::downloadDone(bool error)
//make voicefile //make voicefile
emit logItem(tr("Creating voicefiles..."),LOGINFO); emit logItem(tr("Creating voicefiles..."),LOGINFO);
FILE* ids2 = fopen(filename.toLocal8Bit(), "r"); FILE* ids2 = fopen(m_filename.toLocal8Bit(), "r");
if (ids2 == NULL) if (ids2 == NULL)
{ {
cleanup(); cleanup();

7
rbutil/rbutilqt/base/voicefile.h
View file

@ -41,10 +41,10 @@ public:
void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; } void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
void setLang(QString name) { m_lang = name; } void setLang(QString name) { m_lang = name; }
void setWavtrimThreshold(int th){m_wavtrimThreshold = th;} void setWavtrimThreshold(int th){m_wavtrimThreshold = th;}
public slots: public slots:
void abort(); void abort();
signals: signals:
void done(bool); void done(bool);
void aborted(); void aborted();
@ -56,10 +56,11 @@ private slots:
private: private:
void create(void);
void cleanup(); void cleanup();
HttpGet *getter; HttpGet *getter;
QString filename; //the temporary file QString m_filename; //the temporary file
QString m_mountpoint; //mountpoint of the device QString m_mountpoint; //mountpoint of the device
QString m_path; //path where the wav and mp3 files are stored to QString m_path; //path where the wav and mp3 files are stored to
int m_targetid; //the target id int m_targetid; //the target id