From 4fb69b7d20e90746855de122422ac9cabd78f66f Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 22 Jun 2016 09:02:37 +0300 Subject: 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 --- kms++/inc/kms++/atomicreq.h | 6 +++--- kms++/src/atomicreq.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kms++') 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& 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& 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& values) +void AtomicReq::add(kms::DrmPropObject* ob, const map& values) { for(const auto& kvp : values) add(ob, kvp.first, kvp.second); -- cgit v1.2.3