summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2016-06-22 09:02:37 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-06-22 09:32:20 +0300
commit4fb69b7d20e90746855de122422ac9cabd78f66f (patch)
tree8ed6daddd199530f9fdf5c761f9c3b205bcbcd56
parent19188a5529d0a3834fc534d3b233aa5c08b998f4 (diff)
kms++: use DrmPropObject in AtomicReq
The objects to which we set properties with AtomicReq must have properties, so they are DrmPropObjects instead of DrmObjects. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--kms++/inc/kms++/atomicreq.h6
-rw-r--r--kms++/src/atomicreq.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/kms++/inc/kms++/atomicreq.h b/kms++/inc/kms++/atomicreq.h
index 6ebdbf8..a9f779d 100644
--- a/kms++/inc/kms++/atomicreq.h
+++ b/kms++/inc/kms++/atomicreq.h
@@ -20,9 +20,9 @@ public:
AtomicReq& operator=(const AtomicReq& other) = delete;
void add(uint32_t ob_id, uint32_t prop_id, uint64_t value);
- void add(DrmObject *ob, Property *prop, uint64_t value);
- void add(DrmObject *ob, const std::string& prop, uint64_t value);
- void add(DrmObject *ob, const std::map<std::string, uint64_t>& values);
+ void add(DrmPropObject *ob, Property *prop, uint64_t value);
+ void add(DrmPropObject *ob, const std::string& prop, uint64_t value);
+ void add(DrmPropObject *ob, const std::map<std::string, uint64_t>& values);
int test(bool allow_modeset = false);
int commit(void* data, bool allow_modeset = false);
diff --git a/kms++/src/atomicreq.cpp b/kms++/src/atomicreq.cpp
index 01934ae..f2809af 100644
--- a/kms++/src/atomicreq.cpp
+++ b/kms++/src/atomicreq.cpp
@@ -44,17 +44,17 @@ void AtomicReq::add(uint32_t ob_id, uint32_t prop_id, uint64_t value)
throw std::invalid_argument("foo");
}
-void AtomicReq::add(DrmObject *ob, Property *prop, uint64_t value)
+void AtomicReq::add(DrmPropObject* ob, Property *prop, uint64_t value)
{
add(ob->id(), prop->id(), value);
}
-void AtomicReq::add(DrmObject* ob, const string& prop, uint64_t value)
+void AtomicReq::add(kms::DrmPropObject* ob, const string& prop, uint64_t value)
{
- add(ob, m_card.get_prop(prop), value);
+ add(ob, ob->get_prop(prop), value);
}
-void AtomicReq::add(DrmObject* ob, const map<string, uint64_t>& values)
+void AtomicReq::add(kms::DrmPropObject* ob, const map<string, uint64_t>& values)
{
for(const auto& kvp : values)
add(ob, kvp.first, kvp.second);