diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 29 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 9 |
2 files changed, 35 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 9bd7902fc3..1c118a5959 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -55,6 +55,7 @@ bootloadername= | |||
55 | resolution=11x2x1 | 55 | resolution=11x2x1 |
56 | manualname= | 56 | manualname= |
57 | brand=Archos | 57 | brand=Archos |
58 | voicename=player | ||
58 | 59 | ||
59 | [recorder] | 60 | [recorder] |
60 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 61 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
@@ -66,6 +67,7 @@ bootloadername= | |||
66 | resolution=112x64x1 | 67 | resolution=112x64x1 |
67 | manualname= | 68 | manualname= |
68 | brand=Archos | 69 | brand=Archos |
70 | voicename=recorder | ||
69 | 71 | ||
70 | [recorder8mb] | 72 | [recorder8mb] |
71 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 73 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
@@ -77,6 +79,7 @@ bootloadername= | |||
77 | resolution=112x64x1 | 79 | resolution=112x64x1 |
78 | manualname=rockbox-recorder | 80 | manualname=rockbox-recorder |
79 | brand=Archos | 81 | brand=Archos |
82 | voicename=recorder | ||
80 | 83 | ||
81 | [recorderv2] | 84 | [recorderv2] |
82 | name="Jukebox Recorder v2 (20GB)" | 85 | name="Jukebox Recorder v2 (20GB)" |
@@ -88,6 +91,7 @@ bootloadername= | |||
88 | resolution=112x64x1 | 91 | resolution=112x64x1 |
89 | manualname= | 92 | manualname= |
90 | brand=Archos | 93 | brand=Archos |
94 | voicename=recorderv2 | ||
91 | 95 | ||
92 | [fmrecorder] | 96 | [fmrecorder] |
93 | name="Jukebox Recorder FM" | 97 | name="Jukebox Recorder FM" |
@@ -99,6 +103,7 @@ bootloadername= | |||
99 | resolution=112x64x1 | 103 | resolution=112x64x1 |
100 | manualname= | 104 | manualname= |
101 | brand=Archos | 105 | brand=Archos |
106 | voicename=fmrecorder | ||
102 | 107 | ||
103 | [fmrecorder8mb] | 108 | [fmrecorder8mb] |
104 | name="Jukebox Recorder FM (with 8MiB memory)" | 109 | name="Jukebox Recorder FM (with 8MiB memory)" |
@@ -110,6 +115,7 @@ bootloadername= | |||
110 | resolution=112x64x1 | 115 | resolution=112x64x1 |
111 | manualname=rockbox-fmrecorder | 116 | manualname=rockbox-fmrecorder |
112 | brand=Archos | 117 | brand=Archos |
118 | voicename=fmrecorder | ||
113 | 119 | ||
114 | [ondiosp] | 120 | [ondiosp] |
115 | name="Ondio SP" | 121 | name="Ondio SP" |
@@ -121,6 +127,7 @@ bootloadername= | |||
121 | resolution=112x64x1 | 127 | resolution=112x64x1 |
122 | manualname= | 128 | manualname= |
123 | brand=Archos | 129 | brand=Archos |
130 | voicename=ondiosp | ||
124 | 131 | ||
125 | [ondiofm] | 132 | [ondiofm] |
126 | name="Ondio FM" | 133 | name="Ondio FM" |
@@ -132,6 +139,7 @@ bootloadername= | |||
132 | resolution=112x64x1 | 139 | resolution=112x64x1 |
133 | manualname= | 140 | manualname= |
134 | brand=Archos | 141 | brand=Archos |
142 | voicename=ondiofm | ||
135 | 143 | ||
136 | [h100] | 144 | [h100] |
137 | name="iHP100 / iHP110" | 145 | name="iHP100 / iHP110" |
@@ -144,6 +152,7 @@ resolution=160x128x2 | |||
144 | manualname=rockbox-h100 | 152 | manualname=rockbox-h100 |
145 | brand=Iriver | 153 | brand=Iriver |
146 | usbid=0x10063001 | 154 | usbid=0x10063001 |
155 | voicename=h100 | ||
147 | 156 | ||
148 | [h120] | 157 | [h120] |
149 | name="iHP120 / iHP140 / H120 / H140" | 158 | name="iHP120 / iHP140 / H120 / H140" |
@@ -156,6 +165,7 @@ resolution=160x128x2 | |||
156 | manualname=rockbox-h100 | 165 | manualname=rockbox-h100 |
157 | brand=Iriver | 166 | brand=Iriver |
158 | usbid=0x10063002 | 167 | usbid=0x10063002 |
168 | voicename=h120 | ||
159 | 169 | ||
160 | [h300] | 170 | [h300] |
161 | name="H320 / H340" | 171 | name="H320 / H340" |
@@ -168,6 +178,7 @@ resolution=220x176x16 | |||
168 | manualname=rockbox-h300 | 178 | manualname=rockbox-h300 |
169 | brand=Iriver | 179 | brand=Iriver |
170 | usbid=0x10063003 | 180 | usbid=0x10063003 |
181 | voicename=h300 | ||
171 | 182 | ||
172 | [h10_5gbums] | 183 | [h10_5gbums] |
173 | name="H10 (5 / 6GB) UMS" | 184 | name="H10 (5 / 6GB) UMS" |
@@ -180,6 +191,7 @@ resolution=128x128x16 | |||
180 | manualname= | 191 | manualname= |
181 | brand=Iriver | 192 | brand=Iriver |
182 | usbid=0x41022002 | 193 | usbid=0x41022002 |
194 | voicename=h10_5gb | ||
183 | 195 | ||
184 | [h10_5gbmtp] | 196 | [h10_5gbmtp] |
185 | name="H10 (5 / 6GB) MTP" | 197 | name="H10 (5 / 6GB) MTP" |
@@ -192,6 +204,7 @@ resolution=128x128x16 | |||
192 | manualname= | 204 | manualname= |
193 | brand=Iriver | 205 | brand=Iriver |
194 | usbid=0x41022105 | 206 | usbid=0x41022105 |
207 | voicename=h10_5gb | ||
195 | 208 | ||
196 | [h10] | 209 | [h10] |
197 | name="H10 (20GB)" | 210 | name="H10 (20GB)" |
@@ -205,6 +218,7 @@ manualname= | |||
205 | brand=Iriver | 218 | brand=Iriver |
206 | usbid=0x0b7000ba | 219 | usbid=0x0b7000ba |
207 | usberror=0x41022101 | 220 | usberror=0x41022101 |
221 | voicename=h10 | ||
208 | 222 | ||
209 | [ipod1g2g] | 223 | [ipod1g2g] |
210 | name="Ipod (1st / 2nd gen)" | 224 | name="Ipod (1st / 2nd gen)" |
@@ -216,6 +230,7 @@ bootloadername=ipod1g2g | |||
216 | resolution=160x128x2 | 230 | resolution=160x128x2 |
217 | manualname= | 231 | manualname= |
218 | brand=Apple | 232 | brand=Apple |
233 | voicename=ipod1g2g | ||
219 | 234 | ||
220 | [ipodcolor] | 235 | [ipodcolor] |
221 | name="Ipod Colour / Photo / U2 (4th gen)" | 236 | name="Ipod Colour / Photo / U2 (4th gen)" |
@@ -227,6 +242,7 @@ bootloadername=ipodcolor | |||
227 | resolution=220x176x16 | 242 | resolution=220x176x16 |
228 | manualname= | 243 | manualname= |
229 | brand=Apple | 244 | brand=Apple |
245 | voicename=ipodcolor | ||
230 | 246 | ||
231 | [ipodnano] | 247 | [ipodnano] |
232 | name="Ipod Nano (1st gen)" | 248 | name="Ipod Nano (1st gen)" |
@@ -239,6 +255,7 @@ resolution=176x132x16 | |||
239 | manualname= | 255 | manualname= |
240 | brand=Apple | 256 | brand=Apple |
241 | usbid=0x05ac120a | 257 | usbid=0x05ac120a |
258 | voicename=ipodnano | ||
242 | 259 | ||
243 | [ipod4gray] | 260 | [ipod4gray] |
244 | name="Ipod (4th gen, greyscale)" | 261 | name="Ipod (4th gen, greyscale)" |
@@ -250,6 +267,7 @@ bootloadername=ipod4g | |||
250 | resolution=160x128x2 | 267 | resolution=160x128x2 |
251 | manualname= | 268 | manualname= |
252 | brand=Apple | 269 | brand=Apple |
270 | voicename=ipod4gray | ||
253 | 271 | ||
254 | [ipodvideo] | 272 | [ipodvideo] |
255 | name="Ipod Video (5th gen) 30GB" | 273 | name="Ipod Video (5th gen) 30GB" |
@@ -261,6 +279,7 @@ bootloadername=ipodvideo | |||
261 | resolution=320x240x16 | 279 | resolution=320x240x16 |
262 | manualname= | 280 | manualname= |
263 | brand=Apple | 281 | brand=Apple |
282 | voicename=ipodvideo | ||
264 | 283 | ||
265 | [ipodvideo64mb] | 284 | [ipodvideo64mb] |
266 | name="Ipod Video (5th gen) 60/80GB" | 285 | name="Ipod Video (5th gen) 60/80GB" |
@@ -272,6 +291,7 @@ bootloadername=ipodvideo | |||
272 | resolution=320x240x16 | 291 | resolution=320x240x16 |
273 | manualname= | 292 | manualname= |
274 | brand=Apple | 293 | brand=Apple |
294 | voicename=ipodvideo | ||
275 | 295 | ||
276 | [ipod3g] | 296 | [ipod3g] |
277 | name="Ipod (3rd gen)" | 297 | name="Ipod (3rd gen)" |
@@ -284,6 +304,7 @@ resolution=160x128x2 | |||
284 | manualname= | 304 | manualname= |
285 | brand=Apple | 305 | brand=Apple |
286 | usbid=0x05ac1201 | 306 | usbid=0x05ac1201 |
307 | voicename=ipod3g | ||
287 | 308 | ||
288 | [ipodmini1g] | 309 | [ipodmini1g] |
289 | name="Ipod Mini (1st gen)" | 310 | name="Ipod Mini (1st gen)" |
@@ -295,6 +316,7 @@ bootloadername=ipodmini | |||
295 | resolution=138x110x2 | 316 | resolution=138x110x2 |
296 | manualname=rockbox-ipodmini2g | 317 | manualname=rockbox-ipodmini2g |
297 | brand=Apple | 318 | brand=Apple |
319 | voicename=ipodmini1g | ||
298 | 320 | ||
299 | [ipodmini2g] | 321 | [ipodmini2g] |
300 | name="Ipod Mini (2nd gen)" | 322 | name="Ipod Mini (2nd gen)" |
@@ -306,6 +328,7 @@ bootloadername=ipodmini2g | |||
306 | resolution=138x110x2 | 328 | resolution=138x110x2 |
307 | manualname=rockbox-ipodmini2g | 329 | manualname=rockbox-ipodmini2g |
308 | brand=Apple | 330 | brand=Apple |
331 | voicename=ipodmini2g | ||
309 | 332 | ||
310 | [iaudiox5] | 333 | [iaudiox5] |
311 | name="iAudio X5 / X5L" | 334 | name="iAudio X5 / X5L" |
@@ -319,6 +342,7 @@ manualname= | |||
319 | brand=Cowon | 342 | brand=Cowon |
320 | usbid=0x0e210510 | 343 | usbid=0x0e210510 |
321 | usbid=0x0e210513 | 344 | usbid=0x0e210513 |
345 | voicename=iaudiox5 | ||
322 | 346 | ||
323 | [iaudiox5v] | 347 | [iaudiox5v] |
324 | name="iAudio X5V" | 348 | name="iAudio X5V" |
@@ -330,6 +354,7 @@ bootloadername=x5v_fw.bin | |||
330 | resolution=160x128x2 | 354 | resolution=160x128x2 |
331 | manualname= | 355 | manualname= |
332 | brand=Cowon | 356 | brand=Cowon |
357 | voicename=iaudiox5v | ||
333 | 358 | ||
334 | [iaudiom5] | 359 | [iaudiom5] |
335 | name="iAudio M5 / M5L" | 360 | name="iAudio M5 / M5L" |
@@ -342,6 +367,7 @@ resolution=160x128x2 | |||
342 | manualname= | 367 | manualname= |
343 | brand=Cowon | 368 | brand=Cowon |
344 | usbid=0x0e210520 | 369 | usbid=0x0e210520 |
370 | voicename=iaudiom5 | ||
345 | 371 | ||
346 | [gigabeatf] | 372 | [gigabeatf] |
347 | name="Gigabeat F / X" | 373 | name="Gigabeat F / X" |
@@ -353,6 +379,7 @@ resolution=240x320x16 | |||
353 | manualname= | 379 | manualname= |
354 | brand=Toshiba | 380 | brand=Toshiba |
355 | usbid=0x09300009 | 381 | usbid=0x09300009 |
382 | voicename=gigabeatf | ||
356 | 383 | ||
357 | [sansae200] | 384 | [sansae200] |
358 | name="Sansa E200" | 385 | name="Sansa E200" |
@@ -366,6 +393,7 @@ manualname= | |||
366 | brand=Sandisk | 393 | brand=Sandisk |
367 | usbid=0x07817421 | 394 | usbid=0x07817421 |
368 | usberror=0x07810720 | 395 | usberror=0x07810720 |
396 | voicename=sansae200 | ||
369 | 397 | ||
370 | [sansac200] | 398 | [sansac200] |
371 | name="Sansa C200" | 399 | name="Sansa C200" |
@@ -377,6 +405,7 @@ bootloadername=firmware.mi4 | |||
377 | resolution=132x80x16 | 405 | resolution=132x80x16 |
378 | manualname= | 406 | manualname= |
379 | brand=Sandisk | 407 | brand=Sandisk |
408 | voicename=sansac200 | ||
380 | 409 | ||
381 | [tts] | 410 | [tts] |
382 | ttspreset01 = "espeak (default)" | 411 | ttspreset01 = "espeak (default)" |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index d292c211af..558e903e3e 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -663,9 +663,12 @@ void RbUtilQt::installVoice() | |||
663 | installer = new ZipInstaller(this); | 663 | installer = new ZipInstaller(this); |
664 | installer->setUnzip(false); | 664 | installer->setUnzip(false); |
665 | 665 | ||
666 | QString voiceurl = devices->value("voice_url").toString() + "/" + | 666 | QString voiceurl = devices->value("voice_url").toString() + "/" ; |
667 | userSettings->value("platform").toString() + "-" + | 667 | |
668 | versmap.value("arch_date") + "-english.voice"; | 668 | devices->beginGroup(userSettings->value("platform").toString()); |
669 | voiceurl += devices->value("voicename").toString() + "-" + | ||
670 | versmap.value("arch_date") + "-english.voice"; | ||
671 | devices->endGroup(); | ||
669 | qDebug() << voiceurl; | 672 | qDebug() << voiceurl; |
670 | 673 | ||
671 | installer->setProxy(proxy()); | 674 | installer->setProxy(proxy()); |