QWidget *p5 = new QWidget;
m_configShuttle.setupUi(p5);
+ m_configShuttle.toolBtnReload->setIcon(KIcon("view-refresh"));
#ifdef USE_JOGSHUTTLE
connect(m_configShuttle.kcfg_enableshuttle, SIGNAL(stateChanged(int)), this, SLOT(slotCheckShuttle(int)));
connect(m_configShuttle.shuttledevicelist, SIGNAL(activated(int)), this, SLOT(slotUpdateShuttleDevice(int)));
+ connect(m_configShuttle.toolBtnReload, SIGNAL(clicked(bool)), this, SLOT(slotReloadShuttleDevices()));
+
slotCheckShuttle(KdenliveSettings::enableshuttle());
m_configShuttle.shuttledisabled->hide();
{
#ifdef USE_JOGSHUTTLE
m_configShuttle.config_group->setEnabled(state);
- if (m_configShuttle.shuttledevicelist->count() == 0) {
- QString devDirStr = "/dev/input/by-id/";
- QDir devDir(devDirStr);
- 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);
- }
- }
+ m_configShuttle.shuttledevicelist->clear();
- if (KdenliveSettings::shuttledevice().isEmpty()) {
- QTimer::singleShot(1500, this, SLOT(slotUpdateShuttleDevice()));
- }
+ QStringList devNames = KdenliveSettings::shuttledevicenames();
+ QStringList devPaths = KdenliveSettings::shuttledevicepaths();
+
+ if (devNames.count() != devPaths.count()) {
+ return;
+ }
+ for (int i = 0; i < devNames.count(); i++) {
+ m_configShuttle.shuttledevicelist->addItem(
+ devNames.at(i), devPaths.at(i));
}
#endif /* USE_JOGSHUTTLE */
}
}
m_configSdl.kcfg_external_display->setEnabled(KdenliveSettings::decklink_device_found());
}
+
+void KdenliveSettingsDialog::slotReloadShuttleDevices()
+{
+#ifdef USE_JOGSHUTTLE
+ QString devDirStr = "/dev/input/by-id";
+ QDir devDir(devDirStr);
+ if (!devDir.exists()) {
+ devDirStr = "/dev/input";
+ }
+
+ DeviceMap devMap = JogShuttle::enumerateDevices(devDirStr);
+ if (!devMap.isEmpty()) {
+ m_configShuttle.shuttledevicelist->clear();
+ }
+
+ QStringList devNamesList;
+ QStringList devPathList;
+ DeviceMapIter iter = devMap.begin();
+ if (iter == devMap.end()) {
+ KdenliveSettings::shuttledevicenames().clear();
+ KdenliveSettings::shuttledevicepaths().clear();
+ m_configShuttle.shuttledevicelist->clear();
+ }
+ while (iter != devMap.end()) {
+ kDebug() << iter.key() << ": " << iter.value();
+ m_configShuttle.shuttledevicelist->addItem(iter.key(), iter.value());
+ devNamesList << iter.key();
+ devPathList << iter.value();
+ ++iter;
+ }
+
+ KdenliveSettings::setShuttledevicenames(devNamesList);
+ KdenliveSettings::setShuttledevicepaths(devPathList);
+ QTimer::singleShot(200, this, SLOT(slotUpdateShuttleDevice()));
+
+ kDebug() << "Devices reloded";
+
+#endif //USE_JOGSHUTTLE
+}
+
#include "kdenlivesettingsdialog.moc"