devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Recognize and handle MacPods during autodetection.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2010-02-20 22:11:11 +00:00
parent 5998a5507d
commit 7f33b7d9fa
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rbutil/rbutilqt/base/autodetection.cpp
View file

@ -175,6 +175,9 @@ bool Autodetection::detect()
n = ipod_scan(&ipod); n = ipod_scan(&ipod);
if(n == 1) { if(n == 1) {
qDebug() << "[Autodetect] Ipod found:" << ipod.modelstr << "at" << ipod.diskname; 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_device = ipod.targetname;
m_mountpoint = resolveMountPoint(ipod.diskname); m_mountpoint = resolveMountPoint(ipod.diskname);
return true; return true;

6
rbutil/rbutilqt/configure.cpp
View file

@ -616,6 +616,12 @@ void Config::autodetect()
if(detector.errdev() == "h10") if(detector.errdev() == "h10")
text = tr("H10 20GB in MTP mode found!\n" text = tr("H10 20GB in MTP mode found!\n"
"You need to change your player to UMS mode for installation. "); "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!"); text += tr("Unless you changed this installation will fail!");
QMessageBox::critical(this, tr("Fatal error"), text, QMessageBox::Ok); QMessageBox::critical(this, tr("Fatal error"), text, QMessageBox::Ok);