diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index b038aa683d..0526d8d9c9 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -97,6 +97,12 @@ bool Autodetection::detect() | |||
97 | if(m_device.isEmpty()) | 97 | if(m_device.isEmpty()) |
98 | { | 98 | { |
99 | m_device = info.target(); | 99 | m_device = info.target(); |
100 | // special case for video64mb. This is a workaround, and | ||
101 | // should get replaced when autodetection is reworked. | ||
102 | if(m_device == "ipodvideo" || info.ram() == 64) | ||
103 | { | ||
104 | m_device = "ipodvideo64mb"; | ||
105 | } | ||
100 | } | 106 | } |
101 | m_mountpoint = mounts.at(i); | 107 | m_mountpoint = mounts.at(i); |
102 | qDebug() << "[Autodetect] rockbox-info.txt detected:" | 108 | qDebug() << "[Autodetect] rockbox-info.txt detected:" |
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index aab7f0fed5..066adc3fd4 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -233,7 +233,11 @@ RockboxInfo::RockboxInfo(QString mountpoint) | |||
233 | else if(line.contains("Target id:")) | 233 | else if(line.contains("Target id:")) |
234 | { | 234 | { |
235 | m_targetid = line.remove("Target id:").trimmed(); | 235 | m_targetid = line.remove("Target id:").trimmed(); |
236 | } | 236 | } |
237 | else if(line.contains("Memory:")) | ||
238 | { | ||
239 | m_ram = line.remove("Memory:").trimmed().toInt(); | ||
240 | } | ||
237 | } | 241 | } |
238 | 242 | ||
239 | file.close(); | 243 | file.close(); |
diff --git a/rbutil/rbutilqt/base/utils.h b/rbutil/rbutilqt/base/utils.h index ef7d30ec90..ba1989b3c3 100644 --- a/rbutil/rbutilqt/base/utils.h +++ b/rbutil/rbutilqt/base/utils.h | |||
@@ -41,12 +41,14 @@ public: | |||
41 | QString features(){return m_features;} | 41 | QString features(){return m_features;} |
42 | QString targetID() {return m_targetid;} | 42 | QString targetID() {return m_targetid;} |
43 | QString target() {return m_target;} | 43 | QString target() {return m_target;} |
44 | int ram() { return m_ram; } | ||
44 | bool success() { return m_success; } | 45 | bool success() { return m_success; } |
45 | private: | 46 | private: |
46 | QString m_version; | 47 | QString m_version; |
47 | QString m_features; | 48 | QString m_features; |
48 | QString m_targetid; | 49 | QString m_targetid; |
49 | QString m_target; | 50 | QString m_target; |
51 | int m_ram; | ||
50 | bool m_success; | 52 | bool m_success; |
51 | }; | 53 | }; |
52 | 54 | ||