diff options
author | Jerry Zhang <zhangjerry@google.com> | 2018-05-30 04:44:09 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-30 04:44:09 +0200 |
commit | ebb47acad489b59797a4928f710a4c72b79b2e81 (patch) | |
tree | b447638a77922c79fd520f03b3ddabfe5f76a21a /ui.h | |
parent | Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793 (diff) | |
parent | Merge "recovery: c++ify pthread use in UI" (diff) | |
download | android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar.gz android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar.bz2 android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar.lz android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar.xz android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.tar.zst android_bootable_recovery-ebb47acad489b59797a4928f710a4c72b79b2e81.zip |
Diffstat (limited to 'ui.h')
-rw-r--r-- | ui.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -18,10 +18,11 @@ #define RECOVERY_UI_H #include <linux/input.h> // KEY_MAX -#include <pthread.h> #include <atomic> +#include <condition_variable> #include <functional> +#include <mutex> #include <string> #include <thread> #include <vector> @@ -188,8 +189,8 @@ class RecoveryUI { bool InitScreensaver(); // Key event input queue - pthread_mutex_t key_queue_mutex; - pthread_cond_t key_queue_cond; + std::mutex key_queue_mutex; + std::condition_variable key_queue_cond; int key_queue[256], key_queue_len; char key_pressed[KEY_MAX + 1]; // under key_queue_mutex int key_last_down; // under key_queue_mutex |