[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] src: jogshuttle: minor interface change
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:48
Message-ID: E1Wfb6a-0003AX-5R () scm ! kde ! org
[Download RAW message or body]

Git commit 76808ad4e72433b0c9bef2362de735a126175aa6 by Vincent PINON, on behalf of Ed Rogalsky.
Committed on 15/03/2014 at 21:22.
Pushed by vpinon into branch 'next'.

jogshuttle: minor interface change

M  +3    -3    src/jogshuttle.cpp
M  +1    -1    src/lib/external/media_ctrl/mediactrl.c
M  +1    -1    src/lib/external/media_ctrl/mediactrl.h

http://commits.kde.org/kdenlive/76808ad4e72433b0c9bef2362de735a126175aa6

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index 335c137..4b1ed11 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -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);
     }
diff --git a/src/lib/external/media_ctrl/mediactrl.c b/src/lib/external/media_ctrl/mediactrl.c
index 3b32b50..0c70a70 100644
--- a/src/lib/external/media_ctrl/mediactrl.c
+++ b/src/lib/external/media_ctrl/mediactrl.c
@@ -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;
 
diff --git a/src/lib/external/media_ctrl/mediactrl.h b/src/lib/external/media_ctrl/mediactrl.h
index c12b5b2..b9bc229 100644
--- a/src/lib/external/media_ctrl/mediactrl.h
+++ b/src/lib/external/media_ctrl/mediactrl.h
@@ -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 *);
 

[prev in list] [next in list] [prev in thread] [next in thread]