diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 30 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/configurefrm.ui | 124 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 7 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 32 | ||||
-rw-r--r-- | rbutil/rbutilqt/tts.cpp | 2 |
7 files changed, 125 insertions, 73 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index ab926f1aa0..68b8fb571d 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -80,8 +80,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
80 | connect(ui.configTts, SIGNAL(clicked()), this, SLOT(configTts())); | 80 | connect(ui.configTts, SIGNAL(clicked()), this, SLOT(configTts())); |
81 | connect(ui.configEncoder, SIGNAL(clicked()), this, SLOT(configEnc())); | 81 | connect(ui.configEncoder, SIGNAL(clicked()), this, SLOT(configEnc())); |
82 | connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int))); | 82 | connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int))); |
83 | connect(ui.comboEncoder, SIGNAL(currentIndexChanged(int)), this, SLOT(updateEncState(int))); | 83 | |
84 | |||
85 | } | 84 | } |
86 | 85 | ||
87 | 86 | ||
@@ -136,10 +135,7 @@ void Config::accept() | |||
136 | // tts settings | 135 | // tts settings |
137 | int i = ui.comboTts->currentIndex(); | 136 | int i = ui.comboTts->currentIndex(); |
138 | settings->setCurTTS(ui.comboTts->itemData(i).toString()); | 137 | settings->setCurTTS(ui.comboTts->itemData(i).toString()); |
139 | //encoder settings | 138 | |
140 | i = ui.comboEncoder->currentIndex(); | ||
141 | settings->setCurEncoder(ui.comboEncoder->itemData(i).toString()); | ||
142 | |||
143 | // sync settings | 139 | // sync settings |
144 | settings->sync(); | 140 | settings->sync(); |
145 | this->close(); | 141 | this->close(); |
@@ -288,22 +284,14 @@ void Config::setDevices() | |||
288 | // tts / encoder tab | 284 | // tts / encoder tab |
289 | 285 | ||
290 | //encoders | 286 | //encoders |
291 | int index; | 287 | updateEncState(); |
292 | QStringList encoders = EncBase::getEncoderList(); | ||
293 | for(int a = 0; a < encoders.size(); a++) | ||
294 | ui.comboEncoder->addItem(EncBase::getEncoderName(encoders.at(a)), encoders.at(a)); | ||
295 | //update index of combobox | ||
296 | index = ui.comboEncoder->findData(settings->curEncoder()); | ||
297 | if(index < 0) index = 0; | ||
298 | ui.comboEncoder->setCurrentIndex(index); | ||
299 | updateEncState(index); | ||
300 | 288 | ||
301 | //tts | 289 | //tts |
302 | QStringList ttslist = TTSBase::getTTSList(); | 290 | QStringList ttslist = TTSBase::getTTSList(); |
303 | for(int a = 0; a < ttslist.size(); a++) | 291 | for(int a = 0; a < ttslist.size(); a++) |
304 | ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a)); | 292 | ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a)); |
305 | //update index of combobox | 293 | //update index of combobox |
306 | index = ui.comboTts->findData(settings->curTTS()); | 294 | int index = ui.comboTts->findData(settings->curTTS()); |
307 | if(index < 0) index = 0; | 295 | if(index < 0) index = 0; |
308 | ui.comboTts->setCurrentIndex(index); | 296 | ui.comboTts->setCurrentIndex(index); |
309 | updateTtsState(index); | 297 | updateTtsState(index); |
@@ -329,9 +317,10 @@ void Config::updateTtsState(int index) | |||
329 | } | 317 | } |
330 | } | 318 | } |
331 | 319 | ||
332 | void Config::updateEncState(int index) | 320 | void Config::updateEncState() |
333 | { | 321 | { |
334 | QString encoder = ui.comboEncoder->itemData(index).toString(); | 322 | ui.encoderName->setText(EncBase::getEncoderName(settings->curEncoder())); |
323 | QString encoder = settings->curEncoder(); | ||
335 | EncBase* enc = EncBase::getEncoder(encoder); | 324 | EncBase* enc = EncBase::getEncoder(encoder); |
336 | enc->setCfg(settings); | 325 | enc->setCfg(settings); |
337 | 326 | ||
@@ -612,10 +601,9 @@ void Config::configTts() | |||
612 | 601 | ||
613 | void Config::configEnc() | 602 | void Config::configEnc() |
614 | { | 603 | { |
615 | int index = ui.comboEncoder->currentIndex(); | 604 | EncBase* enc = EncBase::getEncoder(settings->curEncoder()); |
616 | EncBase* enc = EncBase::getEncoder(ui.comboEncoder->itemData(index).toString()); | ||
617 | 605 | ||
618 | enc->setCfg(settings); | 606 | enc->setCfg(settings); |
619 | enc->showCfg(); | 607 | enc->showCfg(); |
620 | updateEncState(ui.comboEncoder->currentIndex()); | 608 | updateEncState(); |
621 | } | 609 | } |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index 55f2838537..22adc29b71 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -70,7 +70,7 @@ class Config : public QDialog | |||
70 | void configTts(void); | 70 | void configTts(void); |
71 | void configEnc(void); | 71 | void configEnc(void); |
72 | void updateTtsState(int); | 72 | void updateTtsState(int); |
73 | void updateEncState(int); | 73 | void updateEncState(); |
74 | }; | 74 | }; |
75 | 75 | ||
76 | #endif | 76 | #endif |
diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui index 4c2d3c9b68..943eb238f1 100644 --- a/rbutil/rbutilqt/configurefrm.ui +++ b/rbutil/rbutilqt/configurefrm.ui | |||
@@ -26,11 +26,20 @@ | |||
26 | <number>0</number> | 26 | <number>0</number> |
27 | </property> | 27 | </property> |
28 | <widget class="QWidget" name="tabDevice" > | 28 | <widget class="QWidget" name="tabDevice" > |
29 | <property name="geometry" > | ||
30 | <rect> | ||
31 | <x>0</x> | ||
32 | <y>0</y> | ||
33 | <width>476</width> | ||
34 | <height>366</height> | ||
35 | </rect> | ||
36 | </property> | ||
29 | <attribute name="title" > | 37 | <attribute name="title" > |
30 | <string>&Device</string> | 38 | <string>&Device</string> |
31 | </attribute> | 39 | </attribute> |
32 | <attribute name="icon" > | 40 | <attribute name="icon" > |
33 | <iconset resource="rbutilqt.qrc" >:/icons/rbutil.png</iconset> | 41 | <iconset resource="rbutilqt.qrc" > |
42 | <normaloff>:/icons/rbutil.png</normaloff>:/icons/rbutil.png</iconset> | ||
34 | </attribute> | 43 | </attribute> |
35 | <layout class="QGridLayout" > | 44 | <layout class="QGridLayout" > |
36 | <item row="0" column="0" > | 45 | <item row="0" column="0" > |
@@ -54,7 +63,8 @@ | |||
54 | <string>&Browse</string> | 63 | <string>&Browse</string> |
55 | </property> | 64 | </property> |
56 | <property name="icon" > | 65 | <property name="icon" > |
57 | <iconset resource="rbutilqt.qrc" >:/icons/system-search.png</iconset> | 66 | <iconset resource="rbutilqt.qrc" > |
67 | <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset> | ||
58 | </property> | 68 | </property> |
59 | </widget> | 69 | </widget> |
60 | </item> | 70 | </item> |
@@ -84,7 +94,7 @@ | |||
84 | <property name="orientation" > | 94 | <property name="orientation" > |
85 | <enum>Qt::Horizontal</enum> | 95 | <enum>Qt::Horizontal</enum> |
86 | </property> | 96 | </property> |
87 | <property name="sizeHint" > | 97 | <property name="sizeHint" stdset="0" > |
88 | <size> | 98 | <size> |
89 | <width>40</width> | 99 | <width>40</width> |
90 | <height>20</height> | 100 | <height>20</height> |
@@ -98,18 +108,28 @@ | |||
98 | <string>&Autodetect</string> | 108 | <string>&Autodetect</string> |
99 | </property> | 109 | </property> |
100 | <property name="icon" > | 110 | <property name="icon" > |
101 | <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset> | 111 | <iconset resource="rbutilqt.qrc" > |
112 | <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset> | ||
102 | </property> | 113 | </property> |
103 | </widget> | 114 | </widget> |
104 | </item> | 115 | </item> |
105 | </layout> | 116 | </layout> |
106 | </widget> | 117 | </widget> |
107 | <widget class="QWidget" name="tabProxy" > | 118 | <widget class="QWidget" name="tabProxy" > |
119 | <property name="geometry" > | ||
120 | <rect> | ||
121 | <x>0</x> | ||
122 | <y>0</y> | ||
123 | <width>476</width> | ||
124 | <height>366</height> | ||
125 | </rect> | ||
126 | </property> | ||
108 | <attribute name="title" > | 127 | <attribute name="title" > |
109 | <string>&Proxy</string> | 128 | <string>&Proxy</string> |
110 | </attribute> | 129 | </attribute> |
111 | <attribute name="icon" > | 130 | <attribute name="icon" > |
112 | <iconset resource="rbutilqt.qrc" >:/icons/network-idle.png</iconset> | 131 | <iconset resource="rbutilqt.qrc" > |
132 | <normaloff>:/icons/network-idle.png</normaloff>:/icons/network-idle.png</iconset> | ||
113 | </attribute> | 133 | </attribute> |
114 | <layout class="QGridLayout" > | 134 | <layout class="QGridLayout" > |
115 | <item row="0" column="0" > | 135 | <item row="0" column="0" > |
@@ -210,7 +230,7 @@ | |||
210 | <property name="orientation" > | 230 | <property name="orientation" > |
211 | <enum>Qt::Vertical</enum> | 231 | <enum>Qt::Vertical</enum> |
212 | </property> | 232 | </property> |
213 | <property name="sizeHint" > | 233 | <property name="sizeHint" stdset="0" > |
214 | <size> | 234 | <size> |
215 | <width>20</width> | 235 | <width>20</width> |
216 | <height>40</height> | 236 | <height>40</height> |
@@ -221,11 +241,20 @@ | |||
221 | </layout> | 241 | </layout> |
222 | </widget> | 242 | </widget> |
223 | <widget class="QWidget" name="tabLanguage" > | 243 | <widget class="QWidget" name="tabLanguage" > |
244 | <property name="geometry" > | ||
245 | <rect> | ||
246 | <x>0</x> | ||
247 | <y>0</y> | ||
248 | <width>476</width> | ||
249 | <height>366</height> | ||
250 | </rect> | ||
251 | </property> | ||
224 | <attribute name="title" > | 252 | <attribute name="title" > |
225 | <string>&Language</string> | 253 | <string>&Language</string> |
226 | </attribute> | 254 | </attribute> |
227 | <attribute name="icon" > | 255 | <attribute name="icon" > |
228 | <iconset resource="rbutilqt.qrc" >:/icons/preferences-desktop-locale.png</iconset> | 256 | <iconset resource="rbutilqt.qrc" > |
257 | <normaloff>:/icons/preferences-desktop-locale.png</normaloff>:/icons/preferences-desktop-locale.png</iconset> | ||
229 | </attribute> | 258 | </attribute> |
230 | <layout class="QGridLayout" > | 259 | <layout class="QGridLayout" > |
231 | <item row="0" column="0" > | 260 | <item row="0" column="0" > |
@@ -234,11 +263,20 @@ | |||
234 | </layout> | 263 | </layout> |
235 | </widget> | 264 | </widget> |
236 | <widget class="QWidget" name="tabCache" > | 265 | <widget class="QWidget" name="tabCache" > |
266 | <property name="geometry" > | ||
267 | <rect> | ||
268 | <x>0</x> | ||
269 | <y>0</y> | ||
270 | <width>476</width> | ||
271 | <height>366</height> | ||
272 | </rect> | ||
273 | </property> | ||
237 | <attribute name="title" > | 274 | <attribute name="title" > |
238 | <string>Cac&he</string> | 275 | <string>Cac&he</string> |
239 | </attribute> | 276 | </attribute> |
240 | <attribute name="icon" > | 277 | <attribute name="icon" > |
241 | <iconset resource="rbutilqt.qrc" >:/icons/package-x-generic.png</iconset> | 278 | <iconset resource="rbutilqt.qrc" > |
279 | <normaloff>:/icons/package-x-generic.png</normaloff>:/icons/package-x-generic.png</iconset> | ||
242 | </attribute> | 280 | </attribute> |
243 | <attribute name="toolTip" > | 281 | <attribute name="toolTip" > |
244 | <string>Download cache settings</string> | 282 | <string>Download cache settings</string> |
@@ -286,7 +324,8 @@ | |||
286 | <string>&Browse</string> | 324 | <string>&Browse</string> |
287 | </property> | 325 | </property> |
288 | <property name="icon" > | 326 | <property name="icon" > |
289 | <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset> | 327 | <iconset resource="rbutilqt.qrc" > |
328 | <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset> | ||
290 | </property> | 329 | </property> |
291 | </widget> | 330 | </widget> |
292 | </item> | 331 | </item> |
@@ -318,7 +357,7 @@ | |||
318 | <property name="orientation" > | 357 | <property name="orientation" > |
319 | <enum>Qt::Vertical</enum> | 358 | <enum>Qt::Vertical</enum> |
320 | </property> | 359 | </property> |
321 | <property name="sizeHint" > | 360 | <property name="sizeHint" stdset="0" > |
322 | <size> | 361 | <size> |
323 | <width>20</width> | 362 | <width>20</width> |
324 | <height>61</height> | 363 | <height>61</height> |
@@ -331,7 +370,7 @@ | |||
331 | <property name="orientation" > | 370 | <property name="orientation" > |
332 | <enum>Qt::Horizontal</enum> | 371 | <enum>Qt::Horizontal</enum> |
333 | </property> | 372 | </property> |
334 | <property name="sizeHint" > | 373 | <property name="sizeHint" stdset="0" > |
335 | <size> | 374 | <size> |
336 | <width>40</width> | 375 | <width>40</width> |
337 | <height>20</height> | 376 | <height>20</height> |
@@ -345,18 +384,28 @@ | |||
345 | <string>Clean cache &now</string> | 384 | <string>Clean cache &now</string> |
346 | </property> | 385 | </property> |
347 | <property name="icon" > | 386 | <property name="icon" > |
348 | <iconset resource="rbutilqt.qrc" >:/icons/user-trash-full.png</iconset> | 387 | <iconset resource="rbutilqt.qrc" > |
388 | <normaloff>:/icons/user-trash-full.png</normaloff>:/icons/user-trash-full.png</iconset> | ||
349 | </property> | 389 | </property> |
350 | </widget> | 390 | </widget> |
351 | </item> | 391 | </item> |
352 | </layout> | 392 | </layout> |
353 | </widget> | 393 | </widget> |
354 | <widget class="QWidget" name="tabTts" > | 394 | <widget class="QWidget" name="tabTts" > |
395 | <property name="geometry" > | ||
396 | <rect> | ||
397 | <x>0</x> | ||
398 | <y>0</y> | ||
399 | <width>476</width> | ||
400 | <height>366</height> | ||
401 | </rect> | ||
402 | </property> | ||
355 | <attribute name="title" > | 403 | <attribute name="title" > |
356 | <string>&TTS && Encoder</string> | 404 | <string>&TTS && Encoder</string> |
357 | </attribute> | 405 | </attribute> |
358 | <attribute name="icon" > | 406 | <attribute name="icon" > |
359 | <iconset resource="rbutilqt.qrc" >:/icons/audio-input-microphone.png</iconset> | 407 | <iconset resource="rbutilqt.qrc" > |
408 | <normaloff>:/icons/audio-input-microphone.png</normaloff>:/icons/audio-input-microphone.png</iconset> | ||
360 | </attribute> | 409 | </attribute> |
361 | <layout class="QVBoxLayout" > | 410 | <layout class="QVBoxLayout" > |
362 | <item> | 411 | <item> |
@@ -408,7 +457,8 @@ | |||
408 | <string>Configure &TTS</string> | 457 | <string>Configure &TTS</string> |
409 | </property> | 458 | </property> |
410 | <property name="icon" > | 459 | <property name="icon" > |
411 | <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset> | 460 | <iconset resource="rbutilqt.qrc" > |
461 | <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset> | ||
412 | </property> | 462 | </property> |
413 | </widget> | 463 | </widget> |
414 | </item> | 464 | </item> |
@@ -421,34 +471,14 @@ | |||
421 | <string>Encoder Engine</string> | 471 | <string>Encoder Engine</string> |
422 | </property> | 472 | </property> |
423 | <layout class="QGridLayout" > | 473 | <layout class="QGridLayout" > |
424 | <item row="0" column="0" > | 474 | <item row="0" column="1" > |
425 | <widget class="QLabel" name="labelEncoder" > | ||
426 | <property name="text" > | ||
427 | <string>Select &encoder</string> | ||
428 | </property> | ||
429 | <property name="buddy" > | ||
430 | <cstring>comboEncoder</cstring> | ||
431 | </property> | ||
432 | </widget> | ||
433 | </item> | ||
434 | <item row="0" column="1" colspan="3" > | ||
435 | <widget class="QComboBox" name="comboEncoder" /> | ||
436 | </item> | ||
437 | <item row="1" column="0" > | ||
438 | <widget class="QLabel" name="labelEncoderExecutable" > | ||
439 | <property name="text" > | ||
440 | <string>Configure encoder</string> | ||
441 | </property> | ||
442 | </widget> | ||
443 | </item> | ||
444 | <item row="1" column="1" > | ||
445 | <widget class="QLabel" name="configEncstatus" > | 475 | <widget class="QLabel" name="configEncstatus" > |
446 | <property name="text" > | 476 | <property name="text" > |
447 | <string>Configuration invalid !</string> | 477 | <string>Configuration invalid !</string> |
448 | </property> | 478 | </property> |
449 | </widget> | 479 | </widget> |
450 | </item> | 480 | </item> |
451 | <item row="1" column="2" > | 481 | <item row="0" column="2" > |
452 | <widget class="QLabel" name="configEncstatusimg" > | 482 | <widget class="QLabel" name="configEncstatusimg" > |
453 | <property name="text" > | 483 | <property name="text" > |
454 | <string/> | 484 | <string/> |
@@ -458,13 +488,21 @@ | |||
458 | </property> | 488 | </property> |
459 | </widget> | 489 | </widget> |
460 | </item> | 490 | </item> |
461 | <item row="1" column="3" > | 491 | <item row="0" column="3" > |
462 | <widget class="QPushButton" name="configEncoder" > | 492 | <widget class="QPushButton" name="configEncoder" > |
463 | <property name="text" > | 493 | <property name="text" > |
464 | <string> Configure &Enc</string> | 494 | <string> Configure &Enc</string> |
465 | </property> | 495 | </property> |
466 | <property name="icon" > | 496 | <property name="icon" > |
467 | <iconset resource="rbutilqt.qrc" >:/icons/edit-find.png</iconset> | 497 | <iconset resource="rbutilqt.qrc" > |
498 | <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset> | ||
499 | </property> | ||
500 | </widget> | ||
501 | </item> | ||
502 | <item row="0" column="0" > | ||
503 | <widget class="QLabel" name="encoderName" > | ||
504 | <property name="text" > | ||
505 | <string>encoder name</string> | ||
468 | </property> | 506 | </property> |
469 | </widget> | 507 | </widget> |
470 | </item> | 508 | </item> |
@@ -476,7 +514,7 @@ | |||
476 | <property name="orientation" > | 514 | <property name="orientation" > |
477 | <enum>Qt::Vertical</enum> | 515 | <enum>Qt::Vertical</enum> |
478 | </property> | 516 | </property> |
479 | <property name="sizeHint" > | 517 | <property name="sizeHint" stdset="0" > |
480 | <size> | 518 | <size> |
481 | <width>458</width> | 519 | <width>458</width> |
482 | <height>131</height> | 520 | <height>131</height> |
@@ -493,7 +531,7 @@ | |||
493 | <property name="orientation" > | 531 | <property name="orientation" > |
494 | <enum>Qt::Horizontal</enum> | 532 | <enum>Qt::Horizontal</enum> |
495 | </property> | 533 | </property> |
496 | <property name="sizeHint" > | 534 | <property name="sizeHint" stdset="0" > |
497 | <size> | 535 | <size> |
498 | <width>40</width> | 536 | <width>40</width> |
499 | <height>20</height> | 537 | <height>20</height> |
@@ -507,7 +545,8 @@ | |||
507 | <string>&Ok</string> | 545 | <string>&Ok</string> |
508 | </property> | 546 | </property> |
509 | <property name="icon" > | 547 | <property name="icon" > |
510 | <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset> | 548 | <iconset resource="rbutilqt.qrc" > |
549 | <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset> | ||
511 | </property> | 550 | </property> |
512 | </widget> | 551 | </widget> |
513 | </item> | 552 | </item> |
@@ -517,7 +556,8 @@ | |||
517 | <string>&Cancel</string> | 556 | <string>&Cancel</string> |
518 | </property> | 557 | </property> |
519 | <property name="icon" > | 558 | <property name="icon" > |
520 | <iconset resource="rbutilqt.qrc" >:/icons/process-stop.png</iconset> | 559 | <iconset resource="rbutilqt.qrc" > |
560 | <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset> | ||
521 | </property> | 561 | </property> |
522 | </widget> | 562 | </widget> |
523 | </item> | 563 | </item> |
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 4d1e56aef1..1bb0f73db7 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -253,7 +253,7 @@ QString RbSettings::curLang() | |||
253 | 253 | ||
254 | QString RbSettings::curEncoder() | 254 | QString RbSettings::curEncoder() |
255 | { | 255 | { |
256 | return userSettings->value("encoder").toString(); | 256 | return deviceSettingCurGet("encoder").toString(); |
257 | } | 257 | } |
258 | 258 | ||
259 | QString RbSettings::curTTS() | 259 | QString RbSettings::curTTS() |
@@ -529,11 +529,6 @@ void RbSettings::setCurTTS(QString tts) | |||
529 | userSettings->setValue("tts",tts); | 529 | userSettings->setValue("tts",tts); |
530 | } | 530 | } |
531 | 531 | ||
532 | void RbSettings::setCurEncoder(QString enc) | ||
533 | { | ||
534 | userSettings->setValue("encoder",enc); | ||
535 | } | ||
536 | |||
537 | void RbSettings::setTTSPath(QString tts, QString path) | 532 | void RbSettings::setTTSPath(QString tts, QString path) |
538 | { | 533 | { |
539 | userSettingsGroupSet(tts,"ttspath",path); | 534 | userSettingsGroupSet(tts,"ttspath",path); |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index d650471682..f833c5320f 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -116,7 +116,6 @@ class RbSettings : public QObject | |||
116 | void setCacheDisable(bool on); | 116 | void setCacheDisable(bool on); |
117 | void setCacheOffline(bool on); | 117 | void setCacheOffline(bool on); |
118 | void setCurTTS(QString tts); | 118 | void setCurTTS(QString tts); |
119 | void setCurEncoder(QString enc); | ||
120 | void setTTSPath(QString tts, QString path); | 119 | void setTTSPath(QString tts, QString path); |
121 | void setTTSOptions(QString tts, QString options); | 120 | void setTTSOptions(QString tts, QString options); |
122 | void setTTSSpeed(QString tts, int speed); | 121 | void setTTSSpeed(QString tts, int speed); |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index bcdbf25723..ae56e9375a 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -62,6 +62,7 @@ manualname= | |||
62 | brand=Archos | 62 | brand=Archos |
63 | voicename=player | 63 | voicename=player |
64 | targetid=1 | 64 | targetid=1 |
65 | encoder=lame | ||
65 | 66 | ||
66 | [recorder] | 67 | [recorder] |
67 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 68 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
@@ -75,6 +76,7 @@ manualname= | |||
75 | brand=Archos | 76 | brand=Archos |
76 | voicename=recorder | 77 | voicename=recorder |
77 | targetid=2 | 78 | targetid=2 |
79 | encoder=lame | ||
78 | 80 | ||
79 | [recorder8mb] | 81 | [recorder8mb] |
80 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 82 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
@@ -88,6 +90,7 @@ manualname=rockbox-recorder | |||
88 | brand=Archos | 90 | brand=Archos |
89 | voicename=recorder | 91 | voicename=recorder |
90 | targetid=2 | 92 | targetid=2 |
93 | encoder=lame | ||
91 | 94 | ||
92 | [recorderv2] | 95 | [recorderv2] |
93 | name="Jukebox Recorder v2 (20GB)" | 96 | name="Jukebox Recorder v2 (20GB)" |
@@ -101,6 +104,7 @@ manualname= | |||
101 | brand=Archos | 104 | brand=Archos |
102 | voicename=recorderv2 | 105 | voicename=recorderv2 |
103 | targetid=4 | 106 | targetid=4 |
107 | encoder=lame | ||
104 | 108 | ||
105 | [fmrecorder] | 109 | [fmrecorder] |
106 | name="Jukebox Recorder FM" | 110 | name="Jukebox Recorder FM" |
@@ -114,6 +118,7 @@ manualname= | |||
114 | brand=Archos | 118 | brand=Archos |
115 | voicename=fmrecorder | 119 | voicename=fmrecorder |
116 | targetid=3 | 120 | targetid=3 |
121 | encoder=lame | ||
117 | 122 | ||
118 | [fmrecorder8mb] | 123 | [fmrecorder8mb] |
119 | name="Jukebox Recorder FM (with 8MiB memory)" | 124 | name="Jukebox Recorder FM (with 8MiB memory)" |
@@ -127,6 +132,7 @@ manualname=rockbox-fmrecorder | |||
127 | brand=Archos | 132 | brand=Archos |
128 | voicename=fmrecorder | 133 | voicename=fmrecorder |
129 | targetid=3 | 134 | targetid=3 |
135 | encoder=lame | ||
130 | 136 | ||
131 | [ondiosp] | 137 | [ondiosp] |
132 | name="Ondio SP" | 138 | name="Ondio SP" |
@@ -140,6 +146,7 @@ manualname= | |||
140 | brand=Archos | 146 | brand=Archos |
141 | voicename=ondiosp | 147 | voicename=ondiosp |
142 | targetid=7 | 148 | targetid=7 |
149 | encoder=lame | ||
143 | 150 | ||
144 | [ondiofm] | 151 | [ondiofm] |
145 | name="Ondio FM" | 152 | name="Ondio FM" |
@@ -153,6 +160,7 @@ manualname= | |||
153 | brand=Archos | 160 | brand=Archos |
154 | voicename=ondiofm | 161 | voicename=ondiofm |
155 | targetid=8 | 162 | targetid=8 |
163 | encoder=lame | ||
156 | 164 | ||
157 | [h100] | 165 | [h100] |
158 | name="iHP100 / iHP110" | 166 | name="iHP100 / iHP110" |
@@ -167,6 +175,7 @@ brand=Iriver | |||
167 | usbid=0x10063001 | 175 | usbid=0x10063001 |
168 | voicename=h100 | 176 | voicename=h100 |
169 | targetid=11 | 177 | targetid=11 |
178 | encoder=rbspeex | ||
170 | 179 | ||
171 | [h120] | 180 | [h120] |
172 | name="iHP120 / iHP140 / H120 / H140" | 181 | name="iHP120 / iHP140 / H120 / H140" |
@@ -181,6 +190,7 @@ brand=Iriver | |||
181 | usbid=0x10063002 | 190 | usbid=0x10063002 |
182 | voicename=h120 | 191 | voicename=h120 |
183 | targetid=9 | 192 | targetid=9 |
193 | encoder=rbspeex | ||
184 | 194 | ||
185 | [h300] | 195 | [h300] |
186 | name="H320 / H340" | 196 | name="H320 / H340" |
@@ -195,6 +205,7 @@ brand=Iriver | |||
195 | usbid=0x10063003 | 205 | usbid=0x10063003 |
196 | voicename=h300 | 206 | voicename=h300 |
197 | targetid=10 | 207 | targetid=10 |
208 | encoder=rbspeex | ||
198 | 209 | ||
199 | [h10_5gbums] | 210 | [h10_5gbums] |
200 | name="H10 (5 / 6GB) UMS" | 211 | name="H10 (5 / 6GB) UMS" |
@@ -209,6 +220,7 @@ brand=Iriver | |||
209 | usbid=0x41022002 | 220 | usbid=0x41022002 |
210 | voicename=h10_5gb | 221 | voicename=h10_5gb |
211 | targetid=24 | 222 | targetid=24 |
223 | encoder=rbspeex | ||
212 | 224 | ||
213 | [h10_5gbmtp] | 225 | [h10_5gbmtp] |
214 | name="H10 (5 / 6GB) MTP" | 226 | name="H10 (5 / 6GB) MTP" |
@@ -223,6 +235,7 @@ brand=Iriver | |||
223 | usbid=0x41022105 | 235 | usbid=0x41022105 |
224 | voicename=h10_5gb | 236 | voicename=h10_5gb |
225 | targetid=24 | 237 | targetid=24 |
238 | encoder=rbspeex | ||
226 | 239 | ||
227 | [h10] | 240 | [h10] |
228 | name="H10 (20GB)" | 241 | name="H10 (20GB)" |
@@ -238,6 +251,7 @@ usbid=0x0b7000ba | |||
238 | usberror=0x41022101 | 251 | usberror=0x41022101 |
239 | voicename=h10 | 252 | voicename=h10 |
240 | targetid=22 | 253 | targetid=22 |
254 | encoder=rbspeex | ||
241 | 255 | ||
242 | [ipod1g2g] | 256 | [ipod1g2g] |
243 | name="Ipod (1st / 2nd gen)" | 257 | name="Ipod (1st / 2nd gen)" |
@@ -251,6 +265,7 @@ manualname= | |||
251 | brand=Apple | 265 | brand=Apple |
252 | voicename=ipod1g2g | 266 | voicename=ipod1g2g |
253 | targetid=29 | 267 | targetid=29 |
268 | encoder=rbspeex | ||
254 | 269 | ||
255 | [ipodcolor] | 270 | [ipodcolor] |
256 | name="Ipod Colour / Photo / U2 (4th gen)" | 271 | name="Ipod Colour / Photo / U2 (4th gen)" |
@@ -264,6 +279,7 @@ manualname= | |||
264 | brand=Apple | 279 | brand=Apple |
265 | voicename=ipodcolor | 280 | voicename=ipodcolor |
266 | targetid=13 | 281 | targetid=13 |
282 | encoder=rbspeex | ||
267 | 283 | ||
268 | [ipodnano] | 284 | [ipodnano] |
269 | name="Ipod Nano (1st gen)" | 285 | name="Ipod Nano (1st gen)" |
@@ -278,6 +294,7 @@ brand=Apple | |||
278 | usbincompat=0x05ac1260 | 294 | usbincompat=0x05ac1260 |
279 | voicename=ipodnano | 295 | voicename=ipodnano |
280 | targetid=14 | 296 | targetid=14 |
297 | encoder=rbspeex | ||
281 | 298 | ||
282 | [ipod4gray] | 299 | [ipod4gray] |
283 | name="Ipod (4th gen, greyscale)" | 300 | name="Ipod (4th gen, greyscale)" |
@@ -291,6 +308,7 @@ manualname= | |||
291 | brand=Apple | 308 | brand=Apple |
292 | voicename=ipod4gray | 309 | voicename=ipod4gray |
293 | targetid=17 | 310 | targetid=17 |
311 | encoder=rbspeex | ||
294 | 312 | ||
295 | [ipodvideo] | 313 | [ipodvideo] |
296 | name="Ipod Video (5th gen) 30GB" | 314 | name="Ipod Video (5th gen) 30GB" |
@@ -304,6 +322,7 @@ manualname= | |||
304 | brand=Apple | 322 | brand=Apple |
305 | voicename=ipodvideo | 323 | voicename=ipodvideo |
306 | targetid=15 | 324 | targetid=15 |
325 | encoder=rbspeex | ||
307 | 326 | ||
308 | [ipodvideo64mb] | 327 | [ipodvideo64mb] |
309 | name="Ipod Video (5th gen) 60/80GB" | 328 | name="Ipod Video (5th gen) 60/80GB" |
@@ -318,6 +337,7 @@ brand=Apple | |||
318 | voicename=ipodvideo | 337 | voicename=ipodvideo |
319 | usbincompat=0x05ac1261 | 338 | usbincompat=0x05ac1261 |
320 | targetid=15 | 339 | targetid=15 |
340 | encoder=rbspeex | ||
321 | 341 | ||
322 | [ipod3g] | 342 | [ipod3g] |
323 | name="Ipod (3rd gen)" | 343 | name="Ipod (3rd gen)" |
@@ -332,6 +352,7 @@ brand=Apple | |||
332 | usbid=0x05ac1201 | 352 | usbid=0x05ac1201 |
333 | voicename=ipod3g | 353 | voicename=ipod3g |
334 | targetid=16 | 354 | targetid=16 |
355 | encoder=rbspeex | ||
335 | 356 | ||
336 | [ipodmini1g] | 357 | [ipodmini1g] |
337 | name="Ipod Mini (1st gen)" | 358 | name="Ipod Mini (1st gen)" |
@@ -345,6 +366,7 @@ manualname=rockbox-ipodmini2g | |||
345 | brand=Apple | 366 | brand=Apple |
346 | voicename=ipodmini1g | 367 | voicename=ipodmini1g |
347 | targetid=18 | 368 | targetid=18 |
369 | encoder=rbspeex | ||
348 | 370 | ||
349 | [ipodmini2g] | 371 | [ipodmini2g] |
350 | name="Ipod Mini (2nd gen)" | 372 | name="Ipod Mini (2nd gen)" |
@@ -358,6 +380,7 @@ manualname=rockbox-ipodmini2g | |||
358 | brand=Apple | 380 | brand=Apple |
359 | voicename=ipodmini2g | 381 | voicename=ipodmini2g |
360 | targetid=21 | 382 | targetid=21 |
383 | encoder=rbspeex | ||
361 | 384 | ||
362 | [iaudiox5] | 385 | [iaudiox5] |
363 | name="iAudio X5 / X5L" | 386 | name="iAudio X5 / X5L" |
@@ -372,6 +395,7 @@ brand=Cowon | |||
372 | usbid=0x0e210510, 0x0e210513 | 395 | usbid=0x0e210510, 0x0e210513 |
373 | voicename=iaudiox5 | 396 | voicename=iaudiox5 |
374 | targetid=12 | 397 | targetid=12 |
398 | encoder=rbspeex | ||
375 | 399 | ||
376 | [iaudiox5v] | 400 | [iaudiox5v] |
377 | name="iAudio X5V" | 401 | name="iAudio X5V" |
@@ -385,6 +409,7 @@ manualname= | |||
385 | brand=Cowon | 409 | brand=Cowon |
386 | voicename=iaudiox5v | 410 | voicename=iaudiox5v |
387 | targetid=12 | 411 | targetid=12 |
412 | encoder=rbspeex | ||
388 | 413 | ||
389 | [iaudiom5] | 414 | [iaudiom5] |
390 | name="iAudio M5 / M5L" | 415 | name="iAudio M5 / M5L" |
@@ -399,6 +424,7 @@ brand=Cowon | |||
399 | usbid=0x0e210520 | 424 | usbid=0x0e210520 |
400 | voicename=iaudiom5 | 425 | voicename=iaudiom5 |
401 | targetid=28 | 426 | targetid=28 |
427 | encoder=rbspeex | ||
402 | 428 | ||
403 | [iaudiom3] | 429 | [iaudiom3] |
404 | name="iAudio M3 / M3L" | 430 | name="iAudio M3 / M3L" |
@@ -413,7 +439,7 @@ brand=Cowon | |||
413 | usbid=0x0e210500 | 439 | usbid=0x0e210500 |
414 | voicename=iaudiom3 | 440 | voicename=iaudiom3 |
415 | targetid=37 | 441 | targetid=37 |
416 | 442 | encoder=rbspeex | |
417 | 443 | ||
418 | [gigabeatf] | 444 | [gigabeatf] |
419 | name="Gigabeat F / X" | 445 | name="Gigabeat F / X" |
@@ -427,6 +453,7 @@ brand=Toshiba | |||
427 | usbid=0x09300009 | 453 | usbid=0x09300009 |
428 | voicename=gigabeatf | 454 | voicename=gigabeatf |
429 | targetid=20 | 455 | targetid=20 |
456 | encoder=rbspeex | ||
430 | 457 | ||
431 | [sansae200] | 458 | [sansae200] |
432 | name="Sansa E200" | 459 | name="Sansa E200" |
@@ -443,6 +470,7 @@ usberror=0x07810720 | |||
443 | usbincompat=0x07817422, 0x07817423 | 470 | usbincompat=0x07817422, 0x07817423 |
444 | voicename=sansae200 | 471 | voicename=sansae200 |
445 | targetid=23 | 472 | targetid=23 |
473 | encoder=rbspeex | ||
446 | 474 | ||
447 | [sansac200] | 475 | [sansac200] |
448 | name="Sansa C200" | 476 | name="Sansa C200" |
@@ -457,6 +485,7 @@ brand=Sandisk | |||
457 | usbid=0x07817450, 0x07817451 | 485 | usbid=0x07817450, 0x07817451 |
458 | voicename=sansac200 | 486 | voicename=sansac200 |
459 | targetid=30 | 487 | targetid=30 |
488 | encoder=rbspeex | ||
460 | 489 | ||
461 | [mrobe100] | 490 | [mrobe100] |
462 | name="m:robe100" | 491 | name="m:robe100" |
@@ -471,6 +500,7 @@ brand=Olympus | |||
471 | usbid=0x07b40280 | 500 | usbid=0x07b40280 |
472 | voicename=mrobe100 | 501 | voicename=mrobe100 |
473 | targetid=33 | 502 | targetid=33 |
503 | encoder=rbspeex | ||
474 | 504 | ||
475 | [languages] | 505 | [languages] |
476 | lang1=africaans | 506 | lang1=africaans |
diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp index 538ac257f9..c377cb2dc5 100644 --- a/rbutil/rbutilqt/tts.cpp +++ b/rbutil/rbutilqt/tts.cpp | |||
@@ -203,7 +203,7 @@ bool TTSSapi::start(QString *errStr) | |||
203 | return false; | 203 | return false; |
204 | } | 204 | } |
205 | 205 | ||
206 | if(!voicescript->waitForReadyRead(100)) | 206 | if(!voicescript->waitForReadyRead(300)) |
207 | { | 207 | { |
208 | *errStr = voicescript->readAllStandardError(); | 208 | *errStr = voicescript->readAllStandardError(); |
209 | if(*errStr != "") | 209 | if(*errStr != "") |