diff options
Diffstat (limited to 'rbutil/rbutilqt/encoders.cpp')
-rw-r--r-- | rbutil/rbutilqt/encoders.cpp | 89 |
1 files changed, 31 insertions, 58 deletions
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp index 54fc5ad201..56fcd7c80d 100644 --- a/rbutil/rbutilqt/encoders.cpp +++ b/rbutil/rbutilqt/encoders.cpp | |||
@@ -101,10 +101,8 @@ EncExes::EncExes(QString name,QWidget *parent) : EncBase(parent) | |||
101 | 101 | ||
102 | bool EncExes::start() | 102 | bool EncExes::start() |
103 | { | 103 | { |
104 | userSettings->beginGroup(m_name); | 104 | m_EncExec = settings->encoderPath(m_name); |
105 | m_EncExec = userSettings->value("encoderpath","").toString(); | 105 | m_EncOpts = settings->encoderOptions(m_name); |
106 | m_EncOpts = userSettings->value("encoderoptions","").toString(); | ||
107 | userSettings->endGroup(); | ||
108 | 106 | ||
109 | m_EncTemplate = m_TemplateMap.value(m_name); | 107 | m_EncTemplate = m_TemplateMap.value(m_name); |
110 | 108 | ||
@@ -142,10 +140,8 @@ void EncExes::reset() | |||
142 | void EncExes::showCfg() | 140 | void EncExes::showCfg() |
143 | { | 141 | { |
144 | // try to get config from settings | 142 | // try to get config from settings |
145 | userSettings->beginGroup(m_name); | 143 | QString exepath =settings->encoderPath(m_name); |
146 | QString exepath =userSettings->value("encoderpath","").toString(); | 144 | ui.encoderoptions->setText(settings->encoderOptions(m_name)); |
147 | ui.encoderoptions->setText(userSettings->value("encoderoptions","").toString()); | ||
148 | userSettings->endGroup(); | ||
149 | 145 | ||
150 | if(exepath == "") | 146 | if(exepath == "") |
151 | { | 147 | { |
@@ -184,16 +180,12 @@ void EncExes::showCfg() | |||
184 | 180 | ||
185 | void EncExes::accept(void) | 181 | void EncExes::accept(void) |
186 | { | 182 | { |
187 | if(userSettings != NULL) | 183 | //save settings in user config |
188 | { | 184 | settings->setEncoderPath(m_name,ui.encoderpath->text()); |
189 | //save settings in user config | 185 | settings->setEncoderOptions(m_name,ui.encoderoptions->text()); |
190 | userSettings->beginGroup(m_name); | 186 | |
191 | userSettings->setValue("encoderpath",ui.encoderpath->text()); | 187 | // sync settings |
192 | userSettings->setValue("encoderoptions",ui.encoderoptions->text()); | 188 | settings->sync(); |
193 | userSettings->endGroup(); | ||
194 | // sync settings | ||
195 | userSettings->sync(); | ||
196 | } | ||
197 | this->close(); | 189 | this->close(); |
198 | } | 190 | } |
199 | 191 | ||
@@ -204,9 +196,7 @@ void EncExes::reject(void) | |||
204 | 196 | ||
205 | bool EncExes::configOk() | 197 | bool EncExes::configOk() |
206 | { | 198 | { |
207 | userSettings->beginGroup(m_name); | 199 | QString path = settings->encoderPath(m_name); |
208 | QString path = userSettings->value("encoderpath","").toString(); | ||
209 | userSettings->endGroup(); | ||
210 | 200 | ||
211 | if (QFileInfo(path).exists()) | 201 | if (QFileInfo(path).exists()) |
212 | return true; | 202 | return true; |
@@ -251,19 +241,13 @@ EncRbSpeex::EncRbSpeex(QWidget *parent) : EncBase(parent) | |||
251 | 241 | ||
252 | bool EncRbSpeex::start() | 242 | bool EncRbSpeex::start() |
253 | { | 243 | { |
254 | // no user config | 244 | |
255 | if(userSettings == NULL) | ||
256 | { | ||
257 | return false; | ||
258 | } | ||
259 | // try to get config from settings | 245 | // try to get config from settings |
260 | userSettings->beginGroup("rbspeex"); | 246 | quality = settings->encoderQuality("rbspeex"); |
261 | quality = userSettings->value("quality",defaultQuality).toDouble(); | 247 | complexity = settings->encoderComplexity("rbspeex"); |
262 | complexity = userSettings->value("complexity",defaultComplexity).toInt(); | 248 | volume = settings->encoderVolume("rbspeex"); |
263 | volume =userSettings->value("volume",defaultVolume).toDouble(); | 249 | narrowband = settings->encoderNarrowband("rbspeex"); |
264 | narrowband = userSettings->value("narrowband",false).toBool(); | ||
265 | 250 | ||
266 | userSettings->endGroup(); | ||
267 | 251 | ||
268 | return true; | 252 | return true; |
269 | } | 253 | } |
@@ -309,37 +293,29 @@ void EncRbSpeex::reset() | |||
309 | void EncRbSpeex::showCfg() | 293 | void EncRbSpeex::showCfg() |
310 | { | 294 | { |
311 | //fill in the usersettings | 295 | //fill in the usersettings |
312 | userSettings->beginGroup("rbspeex"); | 296 | ui.volume->setValue(settings->encoderVolume("rbspeex")); |
313 | ui.volume->setValue(userSettings->value("volume",defaultVolume).toDouble()); | 297 | ui.quality->setValue(settings->encoderQuality("rbspeex")); |
314 | ui.quality->setValue(userSettings->value("quality",defaultQuality).toDouble()); | 298 | ui.complexity->setValue(settings->encoderComplexity("rbspeex")); |
315 | ui.complexity->setValue(userSettings->value("complexity",defaultComplexity).toInt()); | ||
316 | 299 | ||
317 | if(userSettings->value("narrowband","False").toString() == "True") | 300 | if(settings->encoderNarrowband("rbspeex")) |
318 | ui.narrowband->setCheckState(Qt::Checked); | 301 | ui.narrowband->setCheckState(Qt::Checked); |
319 | else | 302 | else |
320 | ui.narrowband->setCheckState(Qt::Unchecked); | 303 | ui.narrowband->setCheckState(Qt::Unchecked); |
321 | 304 | ||
322 | userSettings->endGroup(); | ||
323 | |||
324 | //show dialog | 305 | //show dialog |
325 | this->exec(); | 306 | this->exec(); |
326 | } | 307 | } |
327 | 308 | ||
328 | void EncRbSpeex::accept(void) | 309 | void EncRbSpeex::accept(void) |
329 | { | 310 | { |
330 | if(userSettings != NULL) | 311 | //save settings in user config |
331 | { | 312 | settings->setEncoderVolume("rbspeex",ui.volume->value()); |
332 | //save settings in user config | 313 | settings->setEncoderQuality("rbspeex",ui.quality->value()); |
333 | userSettings->beginGroup("rbspeex"); | 314 | settings->setEncoderComplexity("rbspeex",ui.complexity->value()); |
334 | userSettings->setValue("volume",ui.volume->value()); | 315 | settings->setEncoderNarrowband("rbspeex",ui.narrowband->isChecked() ? true : false); |
335 | userSettings->setValue("quality",ui.quality->value()); | 316 | |
336 | userSettings->setValue("complexity",ui.complexity->value()); | 317 | // sync settings |
337 | userSettings->setValue("narrowband",ui.narrowband->isChecked() ? true : false); | 318 | settings->sync(); |
338 | |||
339 | userSettings->endGroup(); | ||
340 | // sync settings | ||
341 | userSettings->sync(); | ||
342 | } | ||
343 | this->close(); | 319 | this->close(); |
344 | } | 320 | } |
345 | 321 | ||
@@ -353,18 +329,15 @@ bool EncRbSpeex::configOk() | |||
353 | { | 329 | { |
354 | bool result=true; | 330 | bool result=true; |
355 | // check config | 331 | // check config |
356 | userSettings->beginGroup("rbspeex"); | ||
357 | 332 | ||
358 | if(userSettings->value("volume","null").toDouble() <= 0) | 333 | if(settings->encoderVolume("rbspeex") <= 0) |
359 | result =false; | 334 | result =false; |
360 | 335 | ||
361 | if(userSettings->value("quality","null").toDouble() <= 0) | 336 | if(settings->encoderQuality("rbspeex") <= 0) |
362 | result =false; | 337 | result =false; |
363 | 338 | ||
364 | if(userSettings->value("complexity","null").toInt() <= 0) | 339 | if(settings->encoderComplexity("rbspeex") <= 0) |
365 | result =false; | 340 | result =false; |
366 | |||
367 | userSettings->endGroup(); | ||
368 | 341 | ||
369 | return result; | 342 | return result; |
370 | } | 343 | } |