aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-07-26 18:17:07 -0700
committerJeff Brown <jeffbrown@google.com>2010-07-26 18:17:07 -0700
commit14c49699bbca14a6a92d8a9428af1df06b3f1916 (patch)
treea924703fa82b39d526248f6c44914e5f88b7005b
parent0b098acc31bcd0f40288fc0b31466509ed5df2ee (diff)
downloadquake-14c49699bbca14a6a92d8a9428af1df06b3f1916.tar.gz
Use new EventHub interface.
Change-Id: I0dfb81b2313952458db8b7803901dd4d3f3d6564
-rw-r--r--standalone/main.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/standalone/main.cpp b/standalone/main.cpp
index 89e77aa..7a5b6ee 100644
--- a/standalone/main.cpp
+++ b/standalone/main.cpp
@@ -126,12 +126,18 @@ private:
void* eventThreadMain() {
gHub = new android::EventHub();
while(true) {
- Event event;
- bool result = gHub->getEvent(&event.deviceId,
- &event.type,
- &event.scancode, &event.keycode, &event.flags,
- &event.value, &event.when);
+ android::RawEvent rawEvent;
+ bool result = gHub->getEvent(& rawEvent);
if (result) {
+ Event event;
+ event.deviceId = rawEvent.deviceId;
+ event.when = rawEvent.when;
+ event.type = rawEvent.type;
+ event.value = rawEvent.value;
+ event.keycode = rawEvent.keyCode;
+ event.scancode = rawEvent.scanCode;
+ event.flags = rawEvent.flags;
+
Lock lock(m_mutex);
while( m_Count == MAX_EVENTS) {
lock.wait(m_space_available);