diff options
Diffstat (limited to 'rbutil/rbutilqt/voicefile.cpp')
-rw-r--r-- | rbutil/rbutilqt/voicefile.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp index dd547773b8..4de9b87f34 100644 --- a/rbutil/rbutilqt/voicefile.cpp +++ b/rbutil/rbutilqt/voicefile.cpp | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include "voicefile.h" | 20 | #include "voicefile.h" |
21 | #include "utils.h" | 21 | #include "utils.h" |
22 | #include "rbsettings.h" | ||
22 | 23 | ||
23 | #define STATE_INVALID 0 | 24 | #define STATE_INVALID 0 |
24 | #define STATE_PHRASE 1 | 25 | #define STATE_PHRASE 1 |
@@ -65,7 +66,7 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger) | |||
65 | version = version.left(version.indexOf("-")).remove(0,1); | 66 | version = version.left(version.indexOf("-")).remove(0,1); |
66 | 67 | ||
67 | //prepare download url | 68 | //prepare download url |
68 | QUrl genlangUrl = settings->value(RbSettings::GenlangUrl).toString() | 69 | QUrl genlangUrl = RbSettings::value(RbSettings::GenlangUrl).toString() |
69 | +"?lang=" + m_lang + "&t=" + target + "&rev=" + version + "&f=" + features; | 70 | +"?lang=" + m_lang + "&t=" + target + "&rev=" + version + "&f=" + features; |
70 | 71 | ||
71 | qDebug() << "downloading " << genlangUrl; | 72 | qDebug() << "downloading " << genlangUrl; |
@@ -128,8 +129,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
128 | } | 129 | } |
129 | 130 | ||
130 | //tts | 131 | //tts |
131 | m_tts = TTSBase::getTTS(this,settings->value(RbSettings::Tts).toString()); | 132 | m_tts = TTSBase::getTTS(this,RbSettings::value(RbSettings::Tts).toString()); |
132 | m_tts->setCfg(settings); | ||
133 | 133 | ||
134 | QString errStr; | 134 | QString errStr; |
135 | if(!m_tts->start(&errStr)) | 135 | if(!m_tts->start(&errStr)) |
@@ -142,8 +142,7 @@ void VoiceFileCreator::downloadDone(bool error) | |||
142 | } | 142 | } |
143 | 143 | ||
144 | // Encoder | 144 | // Encoder |
145 | m_enc = EncBase::getEncoder(this,settings->value(RbSettings::CurEncoder).toString()); | 145 | m_enc = EncBase::getEncoder(this,RbSettings::value(RbSettings::CurEncoder).toString()); |
146 | m_enc->setCfg(settings); | ||
147 | 146 | ||
148 | if(!m_enc->start()) | 147 | if(!m_enc->start()) |
149 | { | 148 | { |