Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbutil: Fix broken voice file urls for a few targets.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15929 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-12-14 22:29:18 +00:00
parent ed33c89f9f
commit fb70493f80
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
rbutil/rbutilqt/rbutil.ini
View file

@ -55,6 +55,7 @@ bootloadername=
resolution=11x2x1
manualname=
brand=Archos
voicename=player
[recorder]
name="Jukebox Recorder 6 / 10 / 15 / 20"
@ -66,6 +67,7 @@ bootloadername=
resolution=112x64x1
manualname=
brand=Archos
voicename=recorder
[recorder8mb]
name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
@ -77,6 +79,7 @@ bootloadername=
resolution=112x64x1
manualname=rockbox-recorder
brand=Archos
voicename=recorder
[recorderv2]
name="Jukebox Recorder v2 (20GB)"
@ -88,6 +91,7 @@ bootloadername=
resolution=112x64x1
manualname=
brand=Archos
voicename=recorderv2
[fmrecorder]
name="Jukebox Recorder FM"
@ -99,6 +103,7 @@ bootloadername=
resolution=112x64x1
manualname=
brand=Archos
voicename=fmrecorder
[fmrecorder8mb]
name="Jukebox Recorder FM (with 8MiB memory)"
@ -110,6 +115,7 @@ bootloadername=
resolution=112x64x1
manualname=rockbox-fmrecorder
brand=Archos
voicename=fmrecorder
[ondiosp]
name="Ondio SP"
@ -121,6 +127,7 @@ bootloadername=
resolution=112x64x1
manualname=
brand=Archos
voicename=ondiosp
[ondiofm]
name="Ondio FM"
@ -132,6 +139,7 @@ bootloadername=
resolution=112x64x1
manualname=
brand=Archos
voicename=ondiofm
[h100]
name="iHP100 / iHP110"
@ -144,6 +152,7 @@ resolution=160x128x2
manualname=rockbox-h100
brand=Iriver
usbid=0x10063001
voicename=h100
[h120]
name="iHP120 / iHP140 / H120 / H140"
@ -156,6 +165,7 @@ resolution=160x128x2
manualname=rockbox-h100
brand=Iriver
usbid=0x10063002
voicename=h120
[h300]
name="H320 / H340"
@ -168,6 +178,7 @@ resolution=220x176x16
manualname=rockbox-h300
brand=Iriver
usbid=0x10063003
voicename=h300
[h10_5gbums]
name="H10 (5 / 6GB) UMS"
@ -180,6 +191,7 @@ resolution=128x128x16
manualname=
brand=Iriver
usbid=0x41022002
voicename=h10_5gb
[h10_5gbmtp]
name="H10 (5 / 6GB) MTP"
@ -192,6 +204,7 @@ resolution=128x128x16
manualname=
brand=Iriver
usbid=0x41022105
voicename=h10_5gb
[h10]
name="H10 (20GB)"
@ -205,6 +218,7 @@ manualname=
brand=Iriver
usbid=0x0b7000ba
usberror=0x41022101
voicename=h10
[ipod1g2g]
name="Ipod (1st / 2nd gen)"
@ -216,6 +230,7 @@ bootloadername=ipod1g2g
resolution=160x128x2
manualname=
brand=Apple
voicename=ipod1g2g
[ipodcolor]
name="Ipod Colour / Photo / U2 (4th gen)"
@ -227,6 +242,7 @@ bootloadername=ipodcolor
resolution=220x176x16
manualname=
brand=Apple
voicename=ipodcolor
[ipodnano]
name="Ipod Nano (1st gen)"
@ -239,6 +255,7 @@ resolution=176x132x16
manualname=
brand=Apple
usbid=0x05ac120a
voicename=ipodnano
[ipod4gray]
name="Ipod (4th gen, greyscale)"
@ -250,6 +267,7 @@ bootloadername=ipod4g
resolution=160x128x2
manualname=
brand=Apple
voicename=ipod4gray
[ipodvideo]
name="Ipod Video (5th gen) 30GB"
@ -261,6 +279,7 @@ bootloadername=ipodvideo
resolution=320x240x16
manualname=
brand=Apple
voicename=ipodvideo
[ipodvideo64mb]
name="Ipod Video (5th gen) 60/80GB"
@ -272,6 +291,7 @@ bootloadername=ipodvideo
resolution=320x240x16
manualname=
brand=Apple
voicename=ipodvideo
[ipod3g]
name="Ipod (3rd gen)"
@ -284,6 +304,7 @@ resolution=160x128x2
manualname=
brand=Apple
usbid=0x05ac1201
voicename=ipod3g
[ipodmini1g]
name="Ipod Mini (1st gen)"
@ -295,6 +316,7 @@ bootloadername=ipodmini
resolution=138x110x2
manualname=rockbox-ipodmini2g
brand=Apple
voicename=ipodmini1g
[ipodmini2g]
name="Ipod Mini (2nd gen)"
@ -306,6 +328,7 @@ bootloadername=ipodmini2g
resolution=138x110x2
manualname=rockbox-ipodmini2g
brand=Apple
voicename=ipodmini2g
[iaudiox5]
name="iAudio X5 / X5L"
@ -319,6 +342,7 @@ manualname=
brand=Cowon
usbid=0x0e210510
usbid=0x0e210513
voicename=iaudiox5
[iaudiox5v]
name="iAudio X5V"
@ -330,6 +354,7 @@ bootloadername=x5v_fw.bin
resolution=160x128x2
manualname=
brand=Cowon
voicename=iaudiox5v
[iaudiom5]
name="iAudio M5 / M5L"
@ -342,6 +367,7 @@ resolution=160x128x2
manualname=
brand=Cowon
usbid=0x0e210520
voicename=iaudiom5
[gigabeatf]
name="Gigabeat F / X"
@ -353,6 +379,7 @@ resolution=240x320x16
manualname=
brand=Toshiba
usbid=0x09300009
voicename=gigabeatf
[sansae200]
name="Sansa E200"
@ -366,6 +393,7 @@ manualname=
brand=Sandisk
usbid=0x07817421
usberror=0x07810720
voicename=sansae200
[sansac200]
name="Sansa C200"
@ -377,6 +405,7 @@ bootloadername=firmware.mi4
resolution=132x80x16
manualname=
brand=Sandisk
voicename=sansac200
[tts]
ttspreset01 = "espeak (default)"

9
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -663,9 +663,12 @@ void RbUtilQt::installVoice()
installer = new ZipInstaller(this);
installer->setUnzip(false);
QString voiceurl = devices->value("voice_url").toString() + "/" +
userSettings->value("platform").toString() + "-" +
versmap.value("arch_date") + "-english.voice";
QString voiceurl = devices->value("voice_url").toString() + "/" ;
devices->beginGroup(userSettings->value("platform").toString());
voiceurl += devices->value("voicename").toString() + "-" +
versmap.value("arch_date") + "-english.voice";
devices->endGroup();
qDebug() << voiceurl;
installer->setProxy(proxy());