- if (devDir.exists()) {
- QStringList fileList = devDir.entryList(QDir::Files);
- foreach (const QString &fileName, fileList) {
- QString devFullPath(devDirStr + fileName);
- QString fileLink = JogShuttle::enumerateDevice(devFullPath);
- kDebug() << QString(" [%1] ").arg(fileName);
- kDebug() << QString(" [%1] ").arg(fileLink);
- char name[256] = "unknown";
- int fd = KDE_open((char*)fileLink.toUtf8().data(), O_RDONLY);
- if (fd >= 0 && ioctl(fd, EVIOCGNAME(sizeof(name)), name) >= 0) {
- m_configShuttle.shuttledevicelist->addItem(name, devFullPath);
- }
- ::close(fd);
- }
- } else {
- // parse devices
- QString baseName = "/dev/input/event";
- int fd;
- for (int i = 0; i < 30; ++i) {
- QString filename = baseName + QString::number(i);
- kDebug() << "/// CHECKING device: " << filename;
-
- char name[256] = "unknown";
- fd = KDE_open((char *) filename.toUtf8().data(), O_RDONLY);
- if (fd >= 0 && ioctl(fd, EVIOCGNAME(sizeof(name)), name) >= 0) {
- m_configShuttle.shuttledevicelist->addItem(name, filename);
- }
- ::close(fd);
- }
+ if (!devDir.exists()) {
+ devDirStr = "/dev/input";
+ }
+
+ DeviceMap devMap = JogShuttle::enumerateDevices(devDirStr);
+#if 0
+ if (!devMap.isEmpty()) {
+ m_configShuttle.shuttledevicelist->clear();
+ }
+#endif
+ DeviceMapIter iter = devMap.begin();
+ while (iter != devMap.end()) {
+ kDebug() << iter.key() << ": " << iter.value();
+ m_configShuttle.shuttledevicelist->addItem(
+ iter.key(),
+ iter.value());
+ ++iter;