commit d452f52b2c7b3877160529a73dc2508b9c9cb40b
author Tao Bao <tbao@google.com> Wed Jan 25 00:59:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 00:59:08 2017 +0000
tree f41b5f0355a1351e56e7ced22f4cc7658c45953f
parent 7c4205bdf25eb37c76b40cb61c98893b42b8eeef
parent 187f70c13342bb5b15b399e8609681fd093a85d4

Merge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f am: ebb6a2a00a
am: 187f70c133

Change-Id: Ia0f56a7812eab9a094405190208c9591308ba6d0

slideshow/Android.mk

diff --git a/slideshow/Android.mk b/slideshow/Android.mk
index 8c782c3..f5d85a2 100644
--- a/slideshow/Android.mk
+++ b/slideshow/Android.mk
@@ -11,6 +11,5 @@
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
 
 LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS -Werror
-LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_STATIC_LIBRARIES := libminui libpng libz libutils libstdc++ libcutils liblog libm libc
 include $(BUILD_EXECUTABLE)

slideshow/slideshow.cpp

diff --git a/slideshow/slideshow.cpp b/slideshow/slideshow.cpp
index 15824f8..d3e9f83 100644
--- a/slideshow/slideshow.cpp
+++ b/slideshow/slideshow.cpp
@@ -19,19 +19,21 @@
 #include <limits.h>
 #include <time.h>
 #include <linux/input.h>
+
+#include <functional>
+
 #include <cutils/klog.h>
+#include <minui/minui.h>
 #include <utils/SystemClock.h>
-#include "minui/minui.h"
 
 #define NEXT_TIMEOUT_MS 5000
 #define LAST_TIMEOUT_MS 30000
 
 #define LOGE(x...) do { KLOG_ERROR("slideshow", x); } while (0)
 
-static int input_cb(int fd, unsigned int epevents, void *data)
+static int input_cb(int fd, unsigned int epevents, int *key_code)
 {
     struct input_event ev;
-    int *key_code = (int *)data;
 
     *key_code = -1;
 
@@ -108,7 +110,8 @@
         return usage();
     }
 
-    if (gr_init() == -1 || ev_init(input_cb, &key_code) == -1) {
+    if (gr_init() == -1 || ev_init(std::bind(&input_cb, std::placeholders::_1,
+                                             std::placeholders::_2, &key_code)) == -1) {
         LOGE("failed to initialize minui\n");
         return EXIT_FAILURE;
     }