diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-20 22:11:11 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-20 22:11:11 +0000 |
| commit | 7f33b7d9fa94d7628a22bef3d296ecbcae18b0e9 (patch) | |
| tree | 4f3cb1e5a8f6c0bc9ae7afc7b56a069eafc044cc /rbutil | |
| parent | 5998a5507d470e53f13a885f2482708c851f4eb8 (diff) | |
Recognize and handle MacPods during autodetection.
Previously MacPods were detected but the mountpoint can't get resolved due to
the different partition layout, thus having a MacPod would only detect the Ipod
itself but not the mountpoint. Rockbox does not support MacPods, so inform the
user as soon as possible.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24799 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
| -rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 3 | ||||
| -rw-r--r-- | rbutil/rbutilqt/configure.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 09cfac5767..8e91dc32b1 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp @@ -175,6 +175,9 @@ bool Autodetection::detect() n = ipod_scan(&ipod); if(n == 1) { qDebug() << "[Autodetect] Ipod found:" << ipod.modelstr << "at" << ipod.diskname; + // if the found ipod is a macpod also notice it as device with problem. + if(ipod.macpod) + m_errdev = ipod.targetname; m_device = ipod.targetname; m_mountpoint = resolveMountPoint(ipod.diskname); return true; diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 2e2f2e3531..7507833297 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -616,6 +616,12 @@ void Config::autodetect() if(detector.errdev() == "h10") text = tr("H10 20GB in MTP mode found!\n" "You need to change your player to UMS mode for installation. "); + if(SystemInfo::platformValue(detector.errdev(), + SystemInfo::CurBootloaderMethod) == "ipod") + text = tr("%1 \"MacPod\" found!\n" + "Rockbox needs a FAT formatted Ipod (so-called \"WinPod\") " + "to run. ").arg(SystemInfo::platformValue( + detector.errdev(), SystemInfo::CurName).toString()); text += tr("Unless you changed this installation will fail!"); QMessageBox::critical(this, tr("Fatal error"), text, QMessageBox::Ok); |