commit 991667ba8c77631010d34f9a2e2e70f0d97964a4
author Colin Cross <ccross@android.com> Thu Sep 29 23:35:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 29 23:35:54 2016 +0000
tree 67107ca94e5396806cfdf049265e3abb16a40d1e
parent dfd195160a5bcccde55543585674d91afcadd861
parent c2b9017b595ed146aae181f0efc46c169ea86806

Merge "Rewrite multicharacter constant using constexpr"

include/gui/DisplayEventReceiver.h

diff --git a/include/gui/DisplayEventReceiver.h b/include/gui/DisplayEventReceiver.h
index a4718b9..cb9b373 100644
--- a/include/gui/DisplayEventReceiver.h
+++ b/include/gui/DisplayEventReceiver.h
@@ -35,13 +35,19 @@
 class BitTube;
 class IDisplayEventConnection;
 
-// ----------------------------------------------------------------------------
+static inline constexpr uint32_t fourcc(char c1, char c2, char c3, char c4) {
+    return static_cast<uint32_t>(c1) << 24 |
+        static_cast<uint32_t>(c2) << 16 |
+        static_cast<uint32_t>(c3) << 8 |
+        static_cast<uint32_t>(c4);
+}
 
+// ----------------------------------------------------------------------------
 class DisplayEventReceiver {
 public:
     enum {
-        DISPLAY_EVENT_VSYNC = 'vsyn',
-        DISPLAY_EVENT_HOTPLUG = 'plug'
+        DISPLAY_EVENT_VSYNC = fourcc('v', 's', 'y', 'n'),
+        DISPLAY_EVENT_HOTPLUG = fourcc('p', 'l', 'u', 'g'),
     };
 
     struct Event {