From f37eaaf4ceb098c3952d818a69f0d09a51f8119a Mon Sep 17 00:00:00 2001 From: bluebrother Date: Thu, 23 Aug 2007 22:07:21 +0000 Subject: [PATCH] Add (untested) device detection using sansapatcher. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14445 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/autodetection.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp index e8eb498d6..7fe1a7269 100644 --- a/rbutil/rbutilqt/autodetection.cpp +++ b/rbutil/rbutilqt/autodetection.cpp @@ -52,11 +52,11 @@ bool Autodetection::detect() } } } - + int n; + //try ipodpatcher struct ipod_t ipod; - - int n = ipod_scan(&ipod); + n = ipod_scan(&ipod); if(n == 1) { qDebug() << "Ipod found:" << ipod.modelstr << "at" << ipod.diskname; m_device = ipod.targetname; @@ -65,7 +65,14 @@ bool Autodetection::detect() } //try sansapatcher - + struct sansa_t sansa; + n = sansa_scan(&sansa); + if(n == 1) { + qDebug() << "Sansa found:" << "sansae200" << "at" << sansa.diskname; + m_device = "sansae200"; + m_mountpoint = resolveMountPoint(sansa.diskname); + return true; + } return false; } @@ -119,6 +126,7 @@ QString Autodetection::resolveMountPoint(QString device) QString directory = dir; free( dev ); free( dir ); + fclose(fp); return directory; } free( dev ); -- 2.11.4.GIT