diff --git a/libkms++/card.cpp b/libkms++/card.cpp
index 038d494ee7d7c653e124c6d11530a920ec66f9d9..a0e395eb19acf40eb5ff8f76073d37444cfdd8b2 100644 (file)
--- a/libkms++/card.cpp
+++ b/libkms++/card.cpp
#include "kms++.h"
-#ifndef DRM_CLIENT_CAP_ATOMIC
-#define DRM_CLIENT_CAP_ATOMIC 3
-#endif
-
using namespace std;
namespace kms
m_has_universal_planes = false;
}
+#ifdef DRM_CLIENT_CAP_ATOMIC
if (getenv("LIBKMSXX_DISABLE_ATOMIC") == 0) {
r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1);
m_has_atomic = r == 0;
} else {
m_has_atomic = false;
}
+#else
+ m_has_atomic = false;
+#endif
uint64_t has_dumb;
r = drmGetCap(fd, DRM_CAP_DUMB_BUFFER, &has_dumb);
conn->restore_mode();
}
-template <class T> static void print_obs(const map<uint32_t, DrmObject*>& obmap)
-{
- for (auto pair : obmap) {
- auto ob = pair.second;
- if (dynamic_cast<T*>(ob)) {
- ob->print_short();
- //ob->print_props();
- }
- }
-}
-
-void Card::print_short() const
-{
- print_obs<Connector>(m_obmap);
- print_obs<Encoder>(m_obmap);
- print_obs<Crtc>(m_obmap);
- print_obs<Plane>(m_obmap);
-}
-
Property* Card::get_prop(const string& name) const
{
- for (auto pair : m_obmap) {
- auto prop = dynamic_cast<Property*>(pair.second);
- if (!prop)
- continue;
-
+ for (auto prop : m_properties) {
if (name == prop->name())
return prop;
}
Connector* Card::get_first_connected_connector() const
{
- for(auto pair : m_obmap) {
- auto c = dynamic_cast<Connector*>(pair.second);
-
- if (c && c->connected())
+ for(auto c : m_connectors) {
+ if (c->connected())
return c;
}
Crtc* Card::get_crtc_by_index(uint32_t idx) const
{
- for(auto pair : m_obmap) {
- auto crtc = dynamic_cast<Crtc*>(pair.second);
- if (crtc && crtc->idx() == idx)
- return crtc;
- }
- throw invalid_argument(string("Crtc #") + to_string(idx) + " not found");
+ return m_crtcs[idx];
}
Connector* Card::get_connector(uint32_t id) const { return dynamic_cast<Connector*>(get_object(id)); }