rbutil: use target-id from rockbox-info.txt and remove it from rbutil.ini

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22463 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 1 insertions, 42 deletions

diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index 412554905a..40b2d02bfc 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -55,7 +55,6 @@ const static struct {
     { RbSettings::CurName,              ":platform:/name",      "" },
     { RbSettings::CurBuildserverModel,  ":platform:/buildserver_modelname", "" },
     { RbSettings::CurConfigureModel,    ":platform:/configure_modelname", "" },
-    { RbSettings::CurTargetId,          ":platform:/targetid",  "" },
 };
 
 // user settings
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h
index 7325f87f8b..e178be0e52 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/rbutil/rbutilqt/base/rbsettings.h
@@ -94,7 +94,6 @@ class RbSettings : public QObject
             CurName,
             CurBuildserverModel,
             CurConfigureModel,
-            CurTargetId,
         };
         
         //! call this to flush the user Settings
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp
index 6eff308cd1..8edb240698 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/rbutil/rbutilqt/base/voicefile.cpp
@@ -57,6 +57,7 @@ bool VoiceFileCreator::createVoiceFile()
     QString target = info.target();
     QString features = info.features();
     QString version = info.version();
+    m_targetid = info.targetID().toInt();
     version = version.left(version.indexOf("-")).remove("r");
  
     //prepare download url
diff --git a/rbutil/rbutilqt/base/voicefile.h b/rbutil/rbutilqt/base/voicefile.h
index 26c4a408f7..72f905e4f2 100644
--- a/rbutil/rbutilqt/base/voicefile.h
+++ b/rbutil/rbutilqt/base/voicefile.h
@@ -40,7 +40,6 @@ public:
     bool createVoiceFile();
 
     void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
-    void setTargetId(int id){m_targetid = id;}
     void setLang(QString name){m_lang =name;}
     void setWavtrimThreshold(int th){m_wavtrimThreshold = th;}
     
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 268e9f50e7..e5514ac3e1 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -55,7 +55,6 @@ void CreateVoiceWindow::accept()
     
     //configure voicecreator
     voicecreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
-    voicecreator->setTargetId(RbSettings::value(RbSettings::CurTargetId).toInt());
     voicecreator->setLang(lang);
     voicecreator->setWavtrimThreshold(wvThreshold);
        
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 61d14fa6a5..12bd4563ef 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -66,7 +66,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=player
-targetid=1
 encoder=lame
 
 [recorder]
@@ -77,7 +76,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=recorder
-targetid=2
 encoder=lame
 
 [recorder8mb]
@@ -88,7 +86,6 @@ bootloadername=
 manualname=rockbox-recorder
 brand=Archos
 configure_modelname=recorder
-targetid=2
 encoder=lame
 
 [recorderv2]
@@ -99,7 +96,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=recorderv2
-targetid=4
 encoder=lame
 
 [fmrecorder]
@@ -110,7 +106,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=fmrecorder
-targetid=3
 encoder=lame
 
 [fmrecorder8mb]
@@ -121,7 +116,6 @@ bootloadername=
 manualname=rockbox-fmrecorder
 brand=Archos
 configure_modelname=fmrecorder
-targetid=3
 encoder=lame
 
 [ondiosp]
@@ -132,7 +126,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=ondiosp
-targetid=7
 encoder=lame
 
 [ondiofm]
@@ -143,7 +136,6 @@ bootloadername=
 manualname=
 brand=Archos
 configure_modelname=ondiofm
-targetid=8
 encoder=lame
 
 [h100]
@@ -156,7 +148,6 @@ manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063001
 configure_modelname=h100
-targetid=11
 encoder=rbspeex
 
 [h120]
@@ -169,7 +160,6 @@ manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063002
 configure_modelname=h120
-targetid=9
 encoder=rbspeex
 
 [h300]
@@ -182,7 +172,6 @@ manualname=rockbox-h300
 brand=Iriver
 usbid=0x10063003
 configure_modelname=h300
-targetid=10
 encoder=rbspeex
 
 [h10_5gbums]
@@ -195,7 +184,6 @@ manualname=
 brand=Iriver
 usbid=0x41022002
 configure_modelname=h10_5gb
-targetid=24
 encoder=rbspeex
 
 [h10_5gbmtp]
@@ -208,7 +196,6 @@ manualname=
 brand=Iriver
 usbid=0x41022105
 configure_modelname=h10_5gb
-targetid=24
 encoder=rbspeex
 
 [h10]
@@ -222,7 +209,6 @@ brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
 configure_modelname=h10
-targetid=22
 encoder=rbspeex
 
 [ipod1g2g]
@@ -233,7 +219,6 @@ bootloadername=/ipod/bootloader-ipod1g2g.ipod
 manualname=
 brand=Apple
 configure_modelname=ipod1g2g
-targetid=29
 encoder=rbspeex
 
 [ipodcolor]
@@ -244,7 +229,6 @@ bootloadername=/ipod/bootloader-ipodcolor.ipod
 manualname=
 brand=Apple
 configure_modelname=ipodcolor
-targetid=13
 encoder=rbspeex
 
 [ipodnano]
@@ -255,7 +239,6 @@ bootloadername=/ipod/bootloader-ipodnano.ipod
 manualname=
 brand=Apple
 configure_modelname=ipodnano
-targetid=14
 encoder=rbspeex
 
 [ipod4gray]
@@ -266,7 +249,6 @@ bootloadername=/ipod/bootloader-ipod4g.ipod
 manualname=
 brand=Apple
 configure_modelname=ipod4g
-targetid=17
 encoder=rbspeex
 
 [ipodvideo]
@@ -277,7 +259,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod
 manualname=
 brand=Apple
 configure_modelname=ipodvideo
-targetid=15
 encoder=rbspeex
 
 [ipodvideo64mb]
@@ -288,7 +269,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod
 manualname=
 brand=Apple
 configure_modelname=ipodvideo
-targetid=15
 encoder=rbspeex
 
 [ipod3g]
@@ -300,7 +280,6 @@ manualname=
 brand=Apple
 usbid=0x05ac1201
 configure_modelname=ipod3g
-targetid=16
 encoder=rbspeex
 
 [ipodmini1g]
@@ -311,7 +290,6 @@ bootloadername=/ipod/bootloader-ipodmini.ipod
 manualname=rockbox-ipodmini2g
 brand=Apple
 configure_modelname=ipodmini
-targetid=18
 encoder=rbspeex
 
 [ipodmini2g]
@@ -322,7 +300,6 @@ bootloadername=/ipod/bootloader-ipodmini2g.ipod
 manualname=rockbox-ipodmini2g
 brand=Apple
 configure_modelname=ipodmini2g
-targetid=21
 encoder=rbspeex
 
 [iaudiox5]
@@ -335,7 +312,6 @@ manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
 configure_modelname=x5
-targetid=12
 encoder=rbspeex
 
 [iaudiox5v]
@@ -347,7 +323,6 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin
 manualname=
 brand=Cowon
 configure_modelname=x5
-targetid=12
 encoder=rbspeex
 
 [iaudiom5]
@@ -360,7 +335,6 @@ manualname=
 brand=Cowon
 usbid=0x0e210520
 configure_modelname=m5
-targetid=28
 encoder=rbspeex
 
 [iaudiom3]
@@ -373,7 +347,6 @@ manualname=
 brand=Cowon
 usbid=0x0e210500
 configure_modelname=m3
-targetid=37
 encoder=rbspeex
 
 [gigabeatf]
@@ -386,7 +359,6 @@ manualname=
 brand=Toshiba
 usbid=0x09300009
 configure_modelname=gigabeatf
-targetid=20
 encoder=rbspeex
 
 [sansae200]
@@ -399,7 +371,6 @@ brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
 configure_modelname=e200
-targetid=23
 encoder=rbspeex
 
 [sansac200]
@@ -411,7 +382,6 @@ manualname=
 brand=Sandisk
 usbid=0x07817450, 0x07817451
 configure_modelname=c200
-targetid=30
 encoder=rbspeex
 
 [sansae200v2]
@@ -425,7 +395,6 @@ brand=Sandisk
 usbid=0x07817423
 usberror=0x07817422
 configure_modelname=e200v2
-targetid=51
 encoder=rbspeex
 
 [sansafuze]
@@ -439,7 +408,6 @@ brand=Sandisk
 usbid=0x078174c1
 usberror=0x078174c0
 configure_modelname=fuze
-targetid=53
 encoder=rbspeex
 
 [sansam200v4]
@@ -453,7 +421,6 @@ brand=Sandisk
 usbid=
 usberror=
 configure_modelname=m200v4
-targetid=52
 encoder=rbspeex
 
 [sansaclip]
@@ -467,7 +434,6 @@ brand=Sandisk
 usbid=0x07817433
 usberror=0x07817432
 configure_modelname=clip
-targetid=50
 encoder=rbspeex
 
 
@@ -481,7 +447,6 @@ manualname=
 brand=Olympus
 usbid=0x07b40280
 configure_modelname=mrobe100
-targetid=33
 encoder=rbspeex
 
 [ondavx747]
@@ -533,7 +498,6 @@ manualname=
 brand=Samsung
 usbid=0x04e85023
 configure_modelname=yh820
-targetid=57
 encoder=rbspeex
 
 [smsgyh920]
@@ -546,7 +510,6 @@ manualname=
 brand=Samsung
 usbid=0x04e85022, 0x04e8501d
 configure_modelname=yh920
-targetid=58
 encoder=rbspeex
 
 [smsgyh925]
@@ -559,7 +522,6 @@ manualname=
 brand=Samsung
 usbid=0x04e85024
 configure_modelname=yh925
-targetid=59
 encoder=rbspeex
 
 [05ac1260]