Commit 76808ad4 authored by Ed Rogalsky's avatar Ed Rogalsky Committed by Vincent PINON

jogshuttle: minor interface change

parent 3d49ed7a
......@@ -69,7 +69,7 @@ void ShuttleThread::run()
struct media_ctrl mc;
// open device
media_ctrl_open2(&mc, m_device.toUtf8().data());
media_ctrl_open_dev(&mc, m_device.toUtf8().data());
// on failure return
if (mc.fd < 0) {
......@@ -254,7 +254,7 @@ DeviceMap JogShuttle::enumerateDevices(const QString& devPath)
kDebug() << QString(" [%1] ").arg(fileLink);
struct media_ctrl mc;
media_ctrl_open2(&mc, (char*)fileLink.toUtf8().data());
media_ctrl_open_dev(&mc, (char*)fileLink.toUtf8().data());
if (mc.fd > 0 && mc.device) {
devs.insert(QString(mc.device->name), devFullPath);
kDebug() << QString(" [keys-count=%1] ").arg(
......@@ -272,7 +272,7 @@ int JogShuttle::keysCount(const QString& devPath)
int keysCount = 0;
QString fileLink = canonicalDevice(devPath);
media_ctrl_open2(&mc, (char*)fileLink.toUtf8().data());
media_ctrl_open_dev(&mc, (char*)fileLink.toUtf8().data());
if (mc.fd > 0 && mc.device) {
keysCount = media_ctrl_get_keys_count(&mc);
}
......
......@@ -428,7 +428,7 @@ void media_ctrl_open(struct media_ctrl *mc)
find_first_device(mc);
}
void media_ctrl_open2(struct media_ctrl *mc, const char *devname)
void media_ctrl_open_dev(struct media_ctrl *mc, const char *devname)
{
int fd;
......
......@@ -146,7 +146,7 @@ struct media_ctrl_device {
};
void media_ctrl_open(struct media_ctrl *);
void media_ctrl_open2(struct media_ctrl *, const char *devname);
void media_ctrl_open_dev(struct media_ctrl *, const char *devname);
void media_ctrl_close(struct media_ctrl *);
void media_ctrl_read_event(struct media_ctrl *, struct media_ctrl_event *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment