summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/autodetection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base/autodetection.cpp')
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 00918bf769..58e844b4c3 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -20,6 +20,7 @@
20#include "autodetection.h" 20#include "autodetection.h"
21#include "rbsettings.h" 21#include "rbsettings.h"
22#include "systeminfo.h" 22#include "systeminfo.h"
23#include "playerbuildinfo.h"
23 24
24#include "../ipodpatcher/ipodpatcher.h" 25#include "../ipodpatcher/ipodpatcher.h"
25#include "../sansapatcher/sansapatcher.h" 26#include "../sansapatcher/sansapatcher.h"
@@ -69,7 +70,8 @@ bool Autodetection::detect(void)
69 } 70 }
70 for(int i = 0; i < m_detected.size(); ++i) { 71 for(int i = 0; i < m_detected.size(); ++i) {
71 LOG_INFO() << "Detected player:" << m_detected.at(i).device 72 LOG_INFO() << "Detected player:" << m_detected.at(i).device
72 << "at" << m_detected.at(i).mountpoint << states[m_detected.at(i).status]; 73 << "at" << m_detected.at(i).mountpoint
74 << states[m_detected.at(i).status];
73 } 75 }
74 76
75 return m_detected.size() > 0; 77 return m_detected.size() > 0;
@@ -108,7 +110,8 @@ void Autodetection::detectUsb()
108 LOG_WARNING() << "[USB] detected problem with player" << d.device; 110 LOG_WARNING() << "[USB] detected problem with player" << d.device;
109 } 111 }
110 QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0')); 112 QString idstring = QString("%1").arg(attached.at(i), 8, 16, QChar('0'));
111 if(!SystemInfo::platformValue(SystemInfo::Name, idstring).toString().isEmpty()) { 113 if(!PlayerBuildInfo::instance()->value(
114 PlayerBuildInfo::DisplayName, idstring).toString().isEmpty()) {
112 struct Detected d; 115 struct Detected d;
113 d.status = PlayerIncompatible; 116 d.status = PlayerIncompatible;
114 d.device = idstring; 117 d.device = idstring;