summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-08-15 21:29:31 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-08-15 21:29:31 +0000
commit76100783af55297a81dca0545be8c6c93bcebdd3 (patch)
treeebb64e5a1f7771e8419286bcfdcb2159bf0036e2
parent9cdfbfede4ada50715a662caf89402d0d2e18bcc (diff)
downloadrockbox-76100783af55297a81dca0545be8c6c93bcebdd3.tar.gz
rockbox-76100783af55297a81dca0545be8c6c93bcebdd3.tar.bz2
rockbox-76100783af55297a81dca0545be8c6c93bcebdd3.zip
Improve notification about unsupported players.
- Display the name of a detected unsupported player when running autodetection from the configuration window. - Extend the list of known-unsupported players. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22334 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp5
-rw-r--r--rbutil/rbutilqt/configure.cpp14
-rw-r--r--rbutil/rbutilqt/rbutil.ini75
3 files changed, 82 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index e6819992cf..b038aa683d 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -418,8 +418,9 @@ bool Autodetection::detectUsb()
qDebug() << "[USB] detected problem with player" << m_errdev;
return true;
}
- if(usbincompat.contains(attached.at(i))) {
- m_incompat = usbincompat.value(attached.at(i));
+ QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0'));
+ if(!RbSettings::platformValue(idstring, RbSettings::CurName).toString().isEmpty()) {
+ m_incompat = idstring;
qDebug() << "[USB] detected incompatible player" << m_incompat;
return true;
}
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 43406c00e7..857242a60c 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -588,14 +588,12 @@ void Config::autodetect()
}
if(!detector.incompatdev().isEmpty()) {
QString text;
- // we need to set the platform here to get the brand from the
- // settings object
- RbSettings::setValue(RbSettings::Platform, detector.incompatdev());
- text = tr("Detected an unsupported %1 player variant. Sorry, "
- "Rockbox doesn't run on your player.")
- .arg(RbSettings::value(RbSettings::CurBrand).toString());
-
- QMessageBox::critical(this, tr("Fatal error: incompatible player found"),
+ text = tr("Detected an unsupported player:\n%1\n"
+ "Sorry, Rockbox doesn't run on your player.")
+ .arg(RbSettings::platformValue(detector.incompatdev(),
+ RbSettings::CurName).toString());
+
+ QMessageBox::critical(this, tr("Fatal: player incompatible"),
text, QMessageBox::Ok);
return;
}
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index cb8032b789..739a5d2be4 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -251,7 +251,6 @@ bootloadermethod=ipod
bootloadername=/ipod/bootloader-ipodnano.ipod
manualname=
brand=Apple
-usbincompat=0x05ac1260, 0x05ac1262, 0x05ac1263
configure_modelname=ipodnano
targetid=14
encoder=rbspeex
@@ -286,7 +285,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod
manualname=
brand=Apple
configure_modelname=ipodvideo
-usbincompat=0x05ac1261
targetid=15
encoder=rbspeex
@@ -522,6 +520,79 @@ configure_modelname=yh925
targetid=59
encoder=rbspeex
+[05ac1260]
+name=Apple Ipod Nano (Second Generation)
+
+[05ac1240]
+name=Apple Ipod Nano (Second Generation, DFU Mode)
+
+[05ac1262]
+name=Apple Ipod Nano (Third Generation)
+
+[05ac1263]
+name=Apple Ipod Nano (Fourth Generation)
+
+[05ac1255]
+name=Apple Ipod Nano (Fourth Generation, DFU Mode)
+
+[05ac1261]
+name=Apple Ipod Classic (6th Generation)
+
+[041e4133]
+name=Creative Zen series (Removable Disk Mode)
+
+[041e4151]
+name=Creative Zen Vision:M (MTP)
+
+[041e4150]
+name=Creative Zen V (MTP)
+
+[041e4152]
+name=Creative Zen V Plus (MTP)
+
+[066f3600]
+name=Creative Zen V (HW recovery mode)
+
+[041e4157]
+name=Creative ZEN (MTP)
+
+[041e4128]
+name=Creative NOMAD Jukebox Zen Xtra (MTP)
+
+[041e4111]
+name=Dell Digital Jukebox (First Generation, MTP)
+
+[041e412f]
+name=Dell Digital Jukebox (Second Generation, MTP)
+
+[09300014]
+name=Toshiba Gigabeat V Series, MTP
+
+[09300019]
+name=Toshiba Gigabeat T Series, MTP (No UMS mode)
+
+[07817480]
+name=Sansa Connect (Normal Connection)
+
+[07817481]
+name=Sansa Connect (Recovery Mode)
+
+[07817400]
+name=Sansa m200-tcc (UMS/MSC)
+
+[07817401]
+name=Sansa m200-tcc (MTP)
+
+[07817430]
+name=Sansa m200v4 (MTP)
+
+[07817431]
+name=Sansa m200v4 (MSC)
+
+[078174b1]
+name=Sansa View
+
+
[languages]
lang1=afrikaans
lang2=bulgarian