From a706f157b86e90696808025db01de99646d51a77 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 22 Jun 2016 12:38:30 +0300 Subject: Fix property name lookup Object types can have different properties with the same name, so we need to move name-based property lookup from Card to DrmPropObject. Signed-off-by: Tomi Valkeinen --- kms++/src/atomicreq.cpp | 2 +- kms++/src/card.cpp | 10 ---------- kms++/src/drmpropobject.cpp | 14 +++++++++++++- 3 files changed, 14 insertions(+), 12 deletions(-) (limited to 'kms++/src') diff --git a/kms++/src/atomicreq.cpp b/kms++/src/atomicreq.cpp index c8dd862..f2809af 100644 --- a/kms++/src/atomicreq.cpp +++ b/kms++/src/atomicreq.cpp @@ -51,7 +51,7 @@ void AtomicReq::add(DrmPropObject* ob, Property *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(kms::DrmPropObject* ob, const map& values) diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 0a34d14..12bdef6 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -143,16 +143,6 @@ void Card::restore_modes() conn->restore_mode(); } -Property* Card::get_prop(const string& name) const -{ - for (auto prop : m_properties) { - if (name == prop->name()) - return prop; - } - - throw invalid_argument(string("Card property ") + name + " not found"); -} - Connector* Card::get_first_connected_connector() const { for(auto c : m_connectors) { diff --git a/kms++/src/drmpropobject.cpp b/kms++/src/drmpropobject.cpp index f2edf8b..f5a3c97 100644 --- a/kms++/src/drmpropobject.cpp +++ b/kms++/src/drmpropobject.cpp @@ -45,6 +45,18 @@ void DrmPropObject::refresh_props() drmModeFreeObjectProperties(props); } +Property* DrmPropObject::get_prop(const string& name) const +{ + for (auto pair : m_prop_values) { + auto prop = card().get_prop(pair.first); + + if (name == prop->name()) + return prop; + } + + throw invalid_argument(string("property ") + name + " not found"); +} + uint64_t DrmPropObject::get_prop_value(uint32_t id) const { return m_prop_values.at(id); @@ -75,7 +87,7 @@ int DrmPropObject::set_prop_value(uint32_t id, uint64_t value) int DrmPropObject::set_prop_value(const string &name, uint64_t value) { - Property* prop = card().get_prop(name); + Property* prop = get_prop(name); if (prop == nullptr) throw invalid_argument("property not found: " + name); -- cgit v1.2.3