summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-20 20:29:17 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-03-20 20:29:17 +0000
commit7b2982ac622381351e4c90f3afff3aa2be1a521e (patch)
tree4e85d929ccf9bab719be9b83b445522d58a9ff12
parenta6108b90978e1f8c33963043149061640423c4a3 (diff)
downloadrockbox-7b2982ac622381351e4c90f3afff3aa2be1a521e.tar.gz
rockbox-7b2982ac622381351e4c90f3afff3aa2be1a521e.zip
On windows check for iPod_Control folder to allow resolving the drive letter for Ipods.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16724 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/autodetection.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp
index 97963d4190..d9b77514a8 100644
--- a/rbutil/rbutilqt/autodetection.cpp
+++ b/rbutil/rbutilqt/autodetection.cpp
@@ -135,6 +135,15 @@ bool Autodetection::detect()
135 m_mountpoint = mountpoints.at(i); 135 m_mountpoint = mountpoints.at(i);
136 return true; 136 return true;
137 } 137 }
138#if defined(Q_OS_WIN32)
139 // on windows, try to detect the drive letter of an Ipod
140 if(rootfolders.contains("iPod_Control"), Qt::CaseInsensitive)
141 {
142 // iPod_Control folder -> Ipod found
143 // detecting of the Ipod type is done below using ipodpatcher
144 m_mountpoint = mountpoints.at(i);
145 }
146#endif
138 } 147 }
139 148
140 } 149 }
@@ -146,7 +155,9 @@ bool Autodetection::detect()
146 if(n == 1) { 155 if(n == 1) {
147 qDebug() << "Ipod found:" << ipod.modelstr << "at" << ipod.diskname; 156 qDebug() << "Ipod found:" << ipod.modelstr << "at" << ipod.diskname;
148 m_device = ipod.targetname; 157 m_device = ipod.targetname;
158#if !defined(Q_OS_WIN32)
149 m_mountpoint = resolveMountPoint(ipod.diskname); 159 m_mountpoint = resolveMountPoint(ipod.diskname);
160#endif
150 return true; 161 return true;
151 } 162 }
152 163