diff options
-rw-r--r-- | rbutil/rbutilqt/encoders.cpp | 26 | ||||
-rw-r--r-- | rbutil/rbutilqt/encoders.h | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 18 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzip.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.cpp | 10 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/tts.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/tts.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/voicefile.cpp | 26 | ||||
-rw-r--r-- | rbutil/rbutilqt/voicefile.h | 4 |
10 files changed, 59 insertions, 46 deletions
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp index bb5474ce4d..47e39e87e8 100644 --- a/rbutil/rbutilqt/encoders.cpp +++ b/rbutil/rbutilqt/encoders.cpp | |||
@@ -22,6 +22,8 @@ | |||
22 | 22 | ||
23 | #ifndef CONSOLE | 23 | #ifndef CONSOLE |
24 | #include "encodersgui.h" | 24 | #include "encodersgui.h" |
25 | #else | ||
26 | #include "encodersguicli.h" | ||
25 | #endif | 27 | #endif |
26 | 28 | ||
27 | static QMap<QString,QString> encoderList; | 29 | static QMap<QString,QString> encoderList; |
@@ -53,20 +55,18 @@ EncBase* getEncoder(QString encoder) | |||
53 | return encoderCache.value(encoder); | 55 | return encoderCache.value(encoder); |
54 | 56 | ||
55 | EncBase* enc; | 57 | EncBase* enc; |
56 | if(encoder == "rbspeex") | 58 | if(encoder == "lame") |
57 | { | 59 | { |
58 | enc = new EncRbSpeex(); | 60 | enc = new EncExes(encoder); |
59 | encoderCache[encoder] = enc; | 61 | encoderCache[encoder] = enc; |
60 | return enc; | 62 | return enc; |
61 | } | 63 | } |
62 | else if(encoder == "lame") | 64 | else // rbspeex is default |
63 | { | 65 | { |
64 | enc = new EncExes(encoder); | 66 | enc = new EncRbSpeex(); |
65 | encoderCache[encoder] = enc; | 67 | encoderCache[encoder] = enc; |
66 | return enc; | 68 | return enc; |
67 | } | 69 | } |
68 | else | ||
69 | return NULL; | ||
70 | } | 70 | } |
71 | 71 | ||
72 | 72 | ||
@@ -81,7 +81,7 @@ QStringList getEncoderList() | |||
81 | /********************************************************************* | 81 | /********************************************************************* |
82 | * Encoder Base | 82 | * Encoder Base |
83 | **********************************************************************/ | 83 | **********************************************************************/ |
84 | EncBase::EncBase(QWidget *parent): QDialog(parent) | 84 | EncBase::EncBase(QObject *parent): QObject(parent) |
85 | { | 85 | { |
86 | 86 | ||
87 | } | 87 | } |
@@ -89,7 +89,7 @@ EncBase::EncBase(QWidget *parent): QDialog(parent) | |||
89 | /********************************************************************* | 89 | /********************************************************************* |
90 | * GEneral Exe Encoder | 90 | * GEneral Exe Encoder |
91 | **********************************************************************/ | 91 | **********************************************************************/ |
92 | EncExes::EncExes(QString name,QWidget *parent) : EncBase(parent) | 92 | EncExes::EncExes(QString name,QObject *parent) : EncBase(parent) |
93 | { | 93 | { |
94 | m_name = name; | 94 | m_name = name; |
95 | 95 | ||
@@ -132,7 +132,11 @@ bool EncExes::encode(QString input,QString output) | |||
132 | 132 | ||
133 | void EncExes::showCfg() | 133 | void EncExes::showCfg() |
134 | { | 134 | { |
135 | #ifndef CONSOLE | ||
135 | EncExesGui gui; | 136 | EncExesGui gui; |
137 | #else | ||
138 | EncExesGuiCli gui; | ||
139 | #endif | ||
136 | gui.setCfg(settings); | 140 | gui.setCfg(settings); |
137 | gui.showCfg(m_name); | 141 | gui.showCfg(m_name); |
138 | } | 142 | } |
@@ -152,7 +156,7 @@ bool EncExes::configOk() | |||
152 | /********************************************************************* | 156 | /********************************************************************* |
153 | * RB SPEEX ENCODER | 157 | * RB SPEEX ENCODER |
154 | **********************************************************************/ | 158 | **********************************************************************/ |
155 | EncRbSpeex::EncRbSpeex(QWidget *parent) : EncBase(parent) | 159 | EncRbSpeex::EncRbSpeex(QObject *parent) : EncBase(parent) |
156 | { | 160 | { |
157 | 161 | ||
158 | defaultQuality = 8.f; | 162 | defaultQuality = 8.f; |
@@ -208,7 +212,11 @@ bool EncRbSpeex::encode(QString input,QString output) | |||
208 | 212 | ||
209 | void EncRbSpeex::showCfg() | 213 | void EncRbSpeex::showCfg() |
210 | { | 214 | { |
215 | #ifndef CONSOLE | ||
211 | EncRbSpeexGui gui; | 216 | EncRbSpeexGui gui; |
217 | #else | ||
218 | EncRbSpeexGuiCli gui; | ||
219 | #endif | ||
212 | gui.setCfg(settings); | 220 | gui.setCfg(settings); |
213 | gui.showCfg(defaultQuality,defaultVolume,defaultComplexity,defaultBand); | 221 | gui.showCfg(defaultQuality,defaultVolume,defaultComplexity,defaultBand); |
214 | } | 222 | } |
diff --git a/rbutil/rbutilqt/encoders.h b/rbutil/rbutilqt/encoders.h index 64d57b0ff9..239ca3df79 100644 --- a/rbutil/rbutilqt/encoders.h +++ b/rbutil/rbutilqt/encoders.h | |||
@@ -40,11 +40,11 @@ QString getEncoderName(QString encoder); | |||
40 | QStringList getEncoderList(void); | 40 | QStringList getEncoderList(void); |
41 | 41 | ||
42 | 42 | ||
43 | class EncBase : public QDialog | 43 | class EncBase : public QObject |
44 | { | 44 | { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | public: | 46 | public: |
47 | EncBase(QWidget *parent ); | 47 | EncBase(QObject *parent ); |
48 | 48 | ||
49 | virtual bool encode(QString input,QString output) | 49 | virtual bool encode(QString input,QString output) |
50 | {(void)input; (void)output; return false;} | 50 | {(void)input; (void)output; return false;} |
@@ -71,7 +71,7 @@ class EncExes : public EncBase | |||
71 | { | 71 | { |
72 | Q_OBJECT | 72 | Q_OBJECT |
73 | public: | 73 | public: |
74 | EncExes(QString name,QWidget *parent = NULL); | 74 | EncExes(QString name,QObject *parent = NULL); |
75 | virtual bool encode(QString input,QString output); | 75 | virtual bool encode(QString input,QString output); |
76 | virtual bool start(); | 76 | virtual bool start(); |
77 | virtual bool stop() {return true;} | 77 | virtual bool stop() {return true;} |
@@ -90,7 +90,7 @@ class EncRbSpeex : public EncBase | |||
90 | { | 90 | { |
91 | Q_OBJECT | 91 | Q_OBJECT |
92 | public: | 92 | public: |
93 | EncRbSpeex(QWidget *parent = NULL); | 93 | EncRbSpeex(QObject *parent = NULL); |
94 | virtual bool encode(QString input,QString output); | 94 | virtual bool encode(QString input,QString output); |
95 | virtual bool start(); | 95 | virtual bool start(); |
96 | virtual bool stop() {return true;} | 96 | virtual bool stop() {return true;} |
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 41f88171c5..874417dc9a 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -62,7 +62,7 @@ void ZipInstaller::installContinue() | |||
62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); | 62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); |
63 | m_dp->abort(); | 63 | m_dp->abort(); |
64 | 64 | ||
65 | emit done(false); | 65 | emit done(true); |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | 68 | ||
@@ -89,27 +89,17 @@ void ZipInstaller::installStart() | |||
89 | getter->setProxy(m_proxy); | 89 | getter->setProxy(m_proxy); |
90 | if(m_cache.exists()) { | 90 | if(m_cache.exists()) { |
91 | getter->setCache(m_cache); | 91 | getter->setCache(m_cache); |
92 | qDebug() << "installzip: setting cache to" << m_cache; | 92 | |
93 | } | 93 | } |
94 | getter->setFile(downloadFile); | 94 | getter->setFile(downloadFile); |
95 | getter->getFile(QUrl(m_url)); | 95 | getter->getFile(QUrl(m_url)); |
96 | 96 | ||
97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
98 | connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool))); | ||
99 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 98 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
100 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 99 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
101 | } | 100 | } |
102 | 101 | ||
103 | 102 | ||
104 | void ZipInstaller::downloadRequestFinished(int id, bool error) | ||
105 | { | ||
106 | qDebug() << "Install::downloadRequestFinished" << id << error; | ||
107 | qDebug() << "error:" << getter->errorString(); | ||
108 | |||
109 | downloadDone(error); | ||
110 | } | ||
111 | |||
112 | |||
113 | void ZipInstaller::downloadDone(bool error) | 103 | void ZipInstaller::downloadDone(bool error) |
114 | { | 104 | { |
115 | qDebug() << "Install::downloadDone, error:" << error; | 105 | qDebug() << "Install::downloadDone, error:" << error; |
@@ -125,14 +115,14 @@ void ZipInstaller::downloadDone(bool error) | |||
125 | if(getter->httpResponse() != 200 && !getter->isCached()) { | 115 | if(getter->httpResponse() != 200 && !getter->isCached()) { |
126 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); | 116 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); |
127 | m_dp->abort(); | 117 | m_dp->abort(); |
128 | emit done(true); | 118 | emit done(false); |
129 | return; | 119 | return; |
130 | } | 120 | } |
131 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); | 121 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); |
132 | if(error) { | 122 | if(error) { |
133 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); | 123 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); |
134 | m_dp->abort(); | 124 | m_dp->abort(); |
135 | emit done(true); | 125 | emit done(false); |
136 | return; | 126 | return; |
137 | } | 127 | } |
138 | else m_dp->addItem(tr("Download finished."),LOGOK); | 128 | else m_dp->addItem(tr("Download finished."),LOGOK); |
diff --git a/rbutil/rbutilqt/installzip.h b/rbutil/rbutilqt/installzip.h index 9becbb1b8e..8100dee2b4 100644 --- a/rbutil/rbutilqt/installzip.h +++ b/rbutil/rbutilqt/installzip.h | |||
@@ -56,7 +56,6 @@ signals: | |||
56 | private slots: | 56 | private slots: |
57 | void updateDataReadProgress(int, int); | 57 | void updateDataReadProgress(int, int); |
58 | void downloadDone(bool); | 58 | void downloadDone(bool); |
59 | void downloadRequestFinished(int, bool); | ||
60 | void installStart(void); | 59 | void installStart(void); |
61 | void installContinue(void); | 60 | void installContinue(void); |
62 | 61 | ||
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp index 0df653b972..478e9ea19a 100644 --- a/rbutil/rbutilqt/talkfile.cpp +++ b/rbutil/rbutilqt/talkfile.cpp | |||
@@ -60,10 +60,10 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
60 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); | 60 | connect(logger,SIGNAL(aborted()),this,SLOT(abort())); |
61 | m_logger->setProgressMax(0); | 61 | m_logger->setProgressMax(0); |
62 | 62 | ||
63 | QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags; | 63 | QDirIterator::IteratorFlags flags = QDirIterator::NoIteratorFlags; |
64 | if(m_recursive) | 64 | if(m_recursive) |
65 | flags = QDirIterator::Subdirectories; | 65 | flags = QDirIterator::Subdirectories; |
66 | 66 | ||
67 | QDirIterator it(m_dir,flags); | 67 | QDirIterator it(m_dir,flags); |
68 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); | 68 | QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); |
69 | installlog.beginGroup("talkfiles"); | 69 | installlog.beginGroup("talkfiles"); |
@@ -141,6 +141,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
141 | m_logger->abort(); | 141 | m_logger->abort(); |
142 | m_tts->stop(); | 142 | m_tts->stop(); |
143 | m_enc->stop(); | 143 | m_enc->stop(); |
144 | |||
144 | return false; | 145 | return false; |
145 | } | 146 | } |
146 | QApplication::processEvents(); | 147 | QApplication::processEvents(); |
@@ -152,6 +153,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
152 | m_logger->abort(); | 153 | m_logger->abort(); |
153 | m_tts->stop(); | 154 | m_tts->stop(); |
154 | m_enc->stop(); | 155 | m_enc->stop(); |
156 | |||
155 | return false; | 157 | return false; |
156 | } | 158 | } |
157 | QApplication::processEvents(); | 159 | QApplication::processEvents(); |
diff --git a/rbutil/rbutilqt/talkfile.h b/rbutil/rbutilqt/talkfile.h index 6d3b012413..f3c0c54ce7 100644 --- a/rbutil/rbutilqt/talkfile.h +++ b/rbutil/rbutilqt/talkfile.h | |||
@@ -48,7 +48,7 @@ public: | |||
48 | void setStripExtensions(bool ov) {m_stripExtensions = ov;} | 48 | void setStripExtensions(bool ov) {m_stripExtensions = ov;} |
49 | void setTalkFolders(bool ov) {m_talkFolders = ov;} | 49 | void setTalkFolders(bool ov) {m_talkFolders = ov;} |
50 | void setTalkFiles(bool ov) {m_talkFiles = ov;} | 50 | void setTalkFiles(bool ov) {m_talkFiles = ov;} |
51 | 51 | ||
52 | private slots: | 52 | private slots: |
53 | void abort(); | 53 | void abort(); |
54 | 54 | ||
diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp index eb78f31006..9bdbf6fe3e 100644 --- a/rbutil/rbutilqt/tts.cpp +++ b/rbutil/rbutilqt/tts.cpp | |||
@@ -130,7 +130,11 @@ bool TTSExes::voice(QString text,QString wavfile) | |||
130 | 130 | ||
131 | void TTSExes::showCfg() | 131 | void TTSExes::showCfg() |
132 | { | 132 | { |
133 | #ifndef CONSOLE | ||
133 | TTSExesGui gui; | 134 | TTSExesGui gui; |
135 | #else | ||
136 | TTSExesGuiCli gui; | ||
137 | #endif | ||
134 | gui.setCfg(settings); | 138 | gui.setCfg(settings); |
135 | gui.showCfg(m_name); | 139 | gui.showCfg(m_name); |
136 | } | 140 | } |
@@ -270,7 +274,11 @@ bool TTSSapi::stop() | |||
270 | 274 | ||
271 | void TTSSapi::showCfg() | 275 | void TTSSapi::showCfg() |
272 | { | 276 | { |
277 | #ifndef CONSOLE | ||
273 | TTSSapiGui gui(this); | 278 | TTSSapiGui gui(this); |
279 | #else | ||
280 | TTSSapiGuiCli gui(this); | ||
281 | #endif | ||
274 | gui.setCfg(settings); | 282 | gui.setCfg(settings); |
275 | gui.showCfg(); | 283 | gui.showCfg(); |
276 | } | 284 | } |
diff --git a/rbutil/rbutilqt/tts.h b/rbutil/rbutilqt/tts.h index 40fd4c727c..eb5bbb731a 100644 --- a/rbutil/rbutilqt/tts.h +++ b/rbutil/rbutilqt/tts.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | #ifndef CONSOLE | 28 | #ifndef CONSOLE |
29 | #include "ttsgui.h" | 29 | #include "ttsgui.h" |
30 | #else | ||
31 | #include "ttsguicli.h" | ||
30 | #endif | 32 | #endif |
31 | 33 | ||
32 | class TTSBase; | 34 | class TTSBase; |
diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp index 54fd7a6ec0..42902b93d8 100644 --- a/rbutil/rbutilqt/voicefile.cpp +++ b/rbutil/rbutilqt/voicefile.cpp | |||
@@ -54,6 +54,7 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger) | |||
54 | { | 54 | { |
55 | m_logger->addItem(tr("failed to open rockbox-info.txt"),LOGERROR); | 55 | m_logger->addItem(tr("failed to open rockbox-info.txt"),LOGERROR); |
56 | m_logger->abort(); | 56 | m_logger->abort(); |
57 | emit done(false); | ||
57 | return false; | 58 | return false; |
58 | } | 59 | } |
59 | 60 | ||
@@ -94,22 +95,12 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger) | |||
94 | getter->getFile(genlangUrl); | 95 | getter->getFile(genlangUrl); |
95 | 96 | ||
96 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
97 | connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool))); | ||
98 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 98 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
99 | connect(m_logger, SIGNAL(aborted()), getter, SLOT(abort())); | 99 | connect(m_logger, SIGNAL(aborted()), getter, SLOT(abort())); |
100 | return true; | 100 | return true; |
101 | } | 101 | } |
102 | 102 | ||
103 | 103 | ||
104 | void VoiceFileCreator::downloadRequestFinished(int id, bool error) | ||
105 | { | ||
106 | qDebug() << "Install::downloadRequestFinished" << id << error; | ||
107 | qDebug() << "error:" << getter->errorString(); | ||
108 | |||
109 | downloadDone(error); | ||
110 | } | ||
111 | |||
112 | |||
113 | void VoiceFileCreator::downloadDone(bool error) | 104 | void VoiceFileCreator::downloadDone(bool error) |
114 | { | 105 | { |
115 | qDebug() << "Voice creator::downloadDone, error:" << error; | 106 | qDebug() << "Voice creator::downloadDone, error:" << error; |
@@ -124,12 +115,14 @@ void VoiceFileCreator::downloadDone(bool error) | |||
124 | if(getter->httpResponse() != 200 && !getter->isCached()) { | 115 | if(getter->httpResponse() != 200 && !getter->isCached()) { |
125 | m_logger->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); | 116 | m_logger->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); |
126 | m_logger->abort(); | 117 | m_logger->abort(); |
118 | emit done(false); | ||
127 | return; | 119 | return; |
128 | } | 120 | } |
129 | if(getter->isCached()) m_logger->addItem(tr("Cached file used."), LOGINFO); | 121 | if(getter->isCached()) m_logger->addItem(tr("Cached file used."), LOGINFO); |
130 | if(error) { | 122 | if(error) { |
131 | m_logger->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); | 123 | m_logger->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); |
132 | m_logger->abort(); | 124 | m_logger->abort(); |
125 | emit done(false); | ||
133 | return; | 126 | return; |
134 | } | 127 | } |
135 | else m_logger->addItem(tr("Download finished."),LOGOK); | 128 | else m_logger->addItem(tr("Download finished."),LOGOK); |
@@ -143,6 +136,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
143 | { | 136 | { |
144 | m_logger->addItem(tr("failed to open downloaded file"),LOGERROR); | 137 | m_logger->addItem(tr("failed to open downloaded file"),LOGERROR); |
145 | m_logger->abort(); | 138 | m_logger->abort(); |
139 | emit done(false); | ||
146 | return; | 140 | return; |
147 | } | 141 | } |
148 | 142 | ||
@@ -156,6 +150,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
156 | m_logger->addItem(errStr,LOGERROR); | 150 | m_logger->addItem(errStr,LOGERROR); |
157 | m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR); | 151 | m_logger->addItem(tr("Init of TTS engine failed"),LOGERROR); |
158 | m_logger->abort(); | 152 | m_logger->abort(); |
153 | emit done(false); | ||
159 | return; | 154 | return; |
160 | } | 155 | } |
161 | 156 | ||
@@ -168,6 +163,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
168 | m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR); | 163 | m_logger->addItem(tr("Init of Encoder engine failed"),LOGERROR); |
169 | m_tts->stop(); | 164 | m_tts->stop(); |
170 | m_logger->abort(); | 165 | m_logger->abort(); |
166 | emit done(false); | ||
171 | return; | 167 | return; |
172 | } | 168 | } |
173 | 169 | ||
@@ -210,6 +206,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
210 | m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR); | 206 | m_logger->addItem(tr("The downloaded file was empty!"),LOGERROR); |
211 | m_logger->abort(); | 207 | m_logger->abort(); |
212 | m_tts->stop(); | 208 | m_tts->stop(); |
209 | emit done(false); | ||
213 | return; | 210 | return; |
214 | } | 211 | } |
215 | 212 | ||
@@ -225,6 +222,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
225 | m_logger->addItem("aborted.",LOGERROR); | 222 | m_logger->addItem("aborted.",LOGERROR); |
226 | m_logger->abort(); | 223 | m_logger->abort(); |
227 | m_tts->stop(); | 224 | m_tts->stop(); |
225 | emit done(false); | ||
228 | return; | 226 | return; |
229 | } | 227 | } |
230 | 228 | ||
@@ -269,13 +267,15 @@ void VoiceFileCreator::downloadDone(bool error) | |||
269 | { | 267 | { |
270 | m_logger->addItem(tr("Error opening downloaded file"),LOGERROR); | 268 | m_logger->addItem(tr("Error opening downloaded file"),LOGERROR); |
271 | m_logger->abort(); | 269 | m_logger->abort(); |
270 | emit done(false); | ||
272 | return; | 271 | return; |
273 | } | 272 | } |
274 | 273 | ||
275 | FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang + ".voice").toUtf8(), "wb"); | 274 | FILE* output = fopen(QString(m_mountpoint + "/.rockbox/langs/" + m_lang + ".voice").toUtf8(), "wb"); |
276 | if (output == NULL) | 275 | if (output == NULL) |
277 | { | 276 | { |
278 | m_logger->addItem(tr("Error opening output file"),LOGERROR); | 277 | m_logger->addItem(tr("Error opening output file"),LOGERROR); |
278 | emit done(false); | ||
279 | return; | 279 | return; |
280 | } | 280 | } |
281 | 281 | ||
@@ -290,7 +290,9 @@ void VoiceFileCreator::downloadDone(bool error) | |||
290 | m_logger->setProgressMax(100); | 290 | m_logger->setProgressMax(100); |
291 | m_logger->setProgressValue(100); | 291 | m_logger->setProgressValue(100); |
292 | m_logger->addItem(tr("successfully created."),LOGOK); | 292 | m_logger->addItem(tr("successfully created."),LOGOK); |
293 | m_logger->abort(); | 293 | m_logger->abort(); |
294 | |||
295 | emit done(true); | ||
294 | } | 296 | } |
295 | 297 | ||
296 | void VoiceFileCreator::updateDataReadProgress(int read, int total) | 298 | void VoiceFileCreator::updateDataReadProgress(int read, int total) |
diff --git a/rbutil/rbutilqt/voicefile.h b/rbutil/rbutilqt/voicefile.h index 43eb95a69b..55b2184c3f 100644 --- a/rbutil/rbutilqt/voicefile.h +++ b/rbutil/rbutilqt/voicefile.h | |||
@@ -53,9 +53,11 @@ public: | |||
53 | void setWavtrimThreshold(int th){m_wavtrimThreshold = th;} | 53 | void setWavtrimThreshold(int th){m_wavtrimThreshold = th;} |
54 | void setProxy(QUrl proxy){m_proxy = proxy;} | 54 | void setProxy(QUrl proxy){m_proxy = proxy;} |
55 | 55 | ||
56 | signals: | ||
57 | void done(bool error); | ||
58 | |||
56 | private slots: | 59 | private slots: |
57 | void abort(); | 60 | void abort(); |
58 | void downloadRequestFinished(int id, bool error); | ||
59 | void downloadDone(bool error); | 61 | void downloadDone(bool error); |
60 | void updateDataReadProgress(int read, int total); | 62 | void updateDataReadProgress(int read, int total); |
61 | 63 | ||