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>

diff --git a/kms++/inc/kms++/atomicreq.h b/kms++/inc/kms++/atomicreq.h
index 6ebdbf8add6bbdb5bc41d1b2effea0193ec8642e..a9f779d8565682c7d136d6ae394d6a3fc6aa4f3d 100644 (file)
--- 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 01934ae1358b80756b6372c04b0873e5465d547d..f2809afefeea14383fd26c64ec4628ec3c988538 100644 (file)
--- 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);