X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=c846e9c96e4a10eada03cc6f80943d056bcc0b6d;hb=4b84e98f0c659f04b6e798f9d83e607adf6f6bd2;hp=6a61812e8b927d5cfad461961ef8ceb185b7d895;hpb=2f9294f5de103de1a1a081375470da3571302d06;p=kdenlive diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp index 6a61812e..c846e9c9 100644 --- a/src/jogshuttle.cpp +++ b/src/jogshuttle.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -87,50 +88,59 @@ bool ShuttleThread::isWorking() void ShuttleThread::run() { kDebug() << "------- STARTING SHUTTLE: " << m_device; - /* open file descriptor */ - const int fd = KDE_open((char *) m_device.toUtf8().data(), O_RDONLY); - if (fd < 0) { + struct media_ctrl mc; + media_ctrl_open2(&mc, m_device.toUtf8().data()); + + /* open file descriptor */ + //const int fd = KDE_open((char *) m_device.toUtf8().data(), O_RDONLY); + if (mc.fd < 0) { perror("Can't open Jog Shuttle FILE DESCRIPTOR"); return; } - EV ev; - + EV ev[64]; +#if 0 if (ioctl(fd, EVIOCGRAB, 1) < 0) { fprintf(stderr, "Can't get exclusive access on Jog Shuttle FILE DESCRIPTOR\n"); close(fd); return; } +#endif fd_set readset; struct timeval timeout; int num_warnings = 0, readResult = 0; int result, iof = -1; - +#if 0 /* get fd settings */ if ((iof = fcntl(fd, F_GETFL, 0)) == -1) { fprintf(stderr, "Can't get Jog Shuttle file status\n"); close(fd); return; - } else if (fcntl(fd, F_SETFL, iof | O_NONBLOCK) == -1) { + } +#endif +#if 0 + else if (fcntl(fd, F_SETFL, iof | O_NONBLOCK) == -1) { fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK and stop thread\n"); close(fd); return; } +#endif + struct media_ctrl_event mev; /* enter thread loop */ while (!stop_me) { /* reset the read set */ FD_ZERO(&readset); - FD_SET(fd, &readset); + FD_SET(mc.fd, &readset); /* reinit the timeout structure */ timeout.tv_sec = 0; timeout.tv_usec = 400000; /* 400 ms */ /* do select in blocked mode and wake up after timeout for eval stop_me */ - result = select(fd+1, &readset, NULL, NULL, &timeout); + result = select(mc.fd+1, &readset, NULL, NULL, &timeout); /* see if there was an error or timeout else process event */ if (result < 0 && errno == EINTR) { @@ -146,9 +156,14 @@ void ShuttleThread::run() /* do nothing. reserved for future purposes */ } else { /* we have input */ - if (FD_ISSET(fd, &readset)) { + if (FD_ISSET(mc.fd, &readset)) { /* read input */ - readResult = read(fd, &ev, sizeof(ev)); + mev.type = MEDIA_CTRL_EVENT_NONE; + //readResult = read(fd, ev, sizeof(EV) * 64); + media_ctrl_read_event(&mc, &mev); + /* process event */ + handle_event(mev); +#if 0 if (readResult < 0) { if (num_warnings % 10000 == 0) { /* if device is not available anymore - dead or disconnected */ @@ -165,19 +180,39 @@ void ShuttleThread::run() stop_me = true; } num_warnings++; - } else if (readResult == sizeof(ev)) { - /* process event */ - handle_event(ev); + } else if (readResult < (int)sizeof(EV)) { + fprintf(stderr, "readResult < (int)sizeof(EV)\n"); + /* stop thread */ + stop_me = true; + } else if (readResult % (int)sizeof(EV) != 0) { + fprintf(stderr, "readResult mod (int)sizeof(EV) != 0\n"); + /* stop thread */ + stop_me = true; } else { - fprintf(stderr, "Read nr of bytes != sizeof(ev)\n"); + for (int i = 0; i < readResult / (int)sizeof(EV); i++) { + /* process event */ + handle_event(ev[i]); + } } +#endif } } } -// kDebug() << "Close thread" << "\n"; + kDebug() << "------- STOPPING SHUTTLE: "; /* close the handle and return thread */ - close(fd); + //close(fd); + media_ctrl_close(&mc); +} + +void ShuttleThread::handle_event(struct media_ctrl_event ev) +{ + if (ev.type == MEDIA_CTRL_EVENT_KEY) + key(ev); + else if (ev.type == MEDIA_CTRL_EVENT_JOG) + jog(ev); + else if (ev.type == MEDIA_CTRL_EVENT_SHUTTLE) + shuttle(ev); } void ShuttleThread::handle_event(EV ev) @@ -195,6 +230,14 @@ void ShuttleThread::handle_event(EV ev) } } +void ShuttleThread::key(struct media_ctrl_event ev) +{ + if (ev.value == KEY_PRESS) { + int code = ev.index + 1; + QApplication::postEvent(m_parent, new QEvent((QEvent::Type)(KEY_EVENT_OFFSET + code))); + } +} + void ShuttleThread::key(unsigned short code, unsigned int value) { if (value == 0) { @@ -212,6 +255,11 @@ void ShuttleThread::key(unsigned short code, unsigned int value) } +void ShuttleThread::shuttle(struct media_ctrl_event ev) +{ + QApplication::postEvent(m_parent, new QEvent((QEvent::Type) (JOG_STOP + (ev.value/2)))); +} + void ShuttleThread::shuttle(int value) { //gettimeofday( &last_shuttle, 0 ); @@ -231,6 +279,14 @@ void ShuttleThread::shuttle(int value) QApplication::postEvent(m_parent, new QEvent((QEvent::Type) (JOG_STOP + value))); } +void ShuttleThread::jog(struct media_ctrl_event ev) +{ + if (ev.value < 0) + QApplication::postEvent(m_parent, new QEvent((QEvent::Type) JOG_BACK1)); + else if (ev.value > 0) + QApplication::postEvent(m_parent, new QEvent((QEvent::Type) JOG_FWD1)); +} + void ShuttleThread::jog(unsigned int value) { // generate a synthetic event for the shuttle going @@ -330,6 +386,37 @@ void JogShuttle::customEvent(QEvent* e) emit button(e->type() - KEY_EVENT_OFFSET); } +QString JogShuttle::enumerateDevice(const QString& device) +{ + return QDir(device).canonicalPath(); +} + +DeviceMap JogShuttle::enumerateDevices(const QString& devPath) +{ + DeviceMap devs; + QDir devDir(devPath); + + if (!devDir.exists()) { + return devs; + } + + QStringList fileList = devDir.entryList(QDir::System | QDir::Files); + foreach (const QString &fileName, fileList) { + QString devFullPath = devDir.absoluteFilePath(fileName); + QString fileLink = JogShuttle::enumerateDevice(devFullPath); + kDebug() << QString(" [%1] ").arg(fileName); + kDebug() << QString(" [%1] ").arg(fileLink); + + struct media_ctrl mc; + media_ctrl_open2(&mc, (char*)fileLink.toUtf8().data()); + if (mc.fd > 0 && mc.device) { + devs.insert(QString(mc.device->name), devFullPath); + } + media_ctrl_close(&mc); + } + + return devs; +} // #include "jogshuttle.moc"