commit 0f679aadfe898db7ccd6bf63c55dc57a4f157e7d
author Roman Stratiienko <roman.o.stratiienko@globallogic.com> Wed Sep 29 12:59:48 2021 +0300
committer Roman Stratiienko <roman.o.stratiienko@globallogic.com> Wed Sep 29 12:59:48 2021 +0300
tree 6f52d1559540d31c765bd6794a510c4ba0777114
parent 6662f71844b7bcdc1033674cee01e04a6231d391

drm_hwcomposer: Cleanup DrmPlane::Init()

Adding enum value into map looks ugly.
Create a wrapper in order to fix it.

Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>

drm/DrmProperty.h

diff --git a/drm/DrmProperty.h b/drm/DrmProperty.h
index 8db480a..68f300f 100644
--- a/drm/DrmProperty.h
+++ b/drm/DrmProperty.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <xf86drmMode.h>
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -57,6 +58,10 @@
   [[nodiscard]] auto AtomicSet(drmModeAtomicReq &pset, uint64_t value) const
       -> bool;
 
+  template <class E>
+  auto AddEnumToMap(const std::string &name, E key, std::map<E, uint64_t> &map)
+      -> bool;
+
   operator bool() const {
     return id_ != 0;
   }
@@ -83,6 +88,21 @@
   std::vector<DrmPropertyEnum> enums_;
   std::vector<uint32_t> blob_ids_;
 };
+
+template <class E>
+auto DrmProperty::AddEnumToMap(const std::string &name, E key,
+                               std::map<E, uint64_t> &map) -> bool {
+  uint64_t enum_value = UINT64_MAX;
+  int err = 0;
+  std::tie(enum_value, err) = GetEnumValueWithName(name);
+  if (err == 0) {
+    map[key] = enum_value;
+    return true;
+  }
+
+  return false;
+}
+
 }  // namespace android
 
 #endif  // ANDROID_DRM_PROPERTY_H_