Add DrmObject::set_id()

diff --git a/libkms++/drmobject.cpp b/libkms++/drmobject.cpp
index f48153adc2089259f8b84721dbe8db7ff185c9dc..69ea86e9822c7923ca1d2f337858c96ed9b2253a 100644 (file)
--- a/libkms++/drmobject.cpp
+++ b/libkms++/drmobject.cpp
@@ -11,12 +11,12 @@ namespace kms
 {
 
 DrmObject::DrmObject(Card& card, uint32_t object_type)
-       :m_id(-1), m_card(card), m_object_type(object_type)
+       :m_card(card), m_id(-1), m_object_type(object_type)
 {
 }
 
 DrmObject::DrmObject(Card& card, uint32_t id, uint32_t object_type, uint32_t idx)
-       :m_id(id), m_card(card), m_object_type(object_type), m_idx(idx)
+       :m_card(card), m_id(id), m_object_type(object_type), m_idx(idx)
 {
        refresh_props();
 }
@@ -66,4 +66,9 @@ uint64_t DrmObject::get_prop_value(const char *name) const
 
        throw invalid_argument(string(name) + ": property not found");
 }
+
+void DrmObject::set_id(uint32_t id)
+{
+       m_id = id;
+}
 }

diff --git a/libkms++/drmobject.h b/libkms++/drmobject.h
index 5c945f9d5535713cb7ac4976153dc69a70a4ef01..6c3062c024852d7453c43e424be97e888dbe5254 100644 (file)
--- a/libkms++/drmobject.h
+++ b/libkms++/drmobject.h
@@ -33,12 +33,15 @@ public:
        uint64_t get_prop_value(const char *name) const;
 
 protected:
-       uint32_t m_id;  // protected for Framebuffer...
+       virtual void set_id(uint32_t id);
 
 private:
        Card& m_card;
-       std::map<uint32_t, uint64_t> m_prop_values;
+
+       uint32_t m_id;
        uint32_t m_object_type;
        uint32_t m_idx;
+
+       std::map<uint32_t, uint64_t> m_prop_values;
 };
 }

diff --git a/libkms++/dumbframebuffer.cpp b/libkms++/dumbframebuffer.cpp
index 8e776047b3789fa15b542b8e6b3298f17b97d026..285803f339f50891d262aebb682b0895c0ae737d 100644 (file)
--- a/libkms++/dumbframebuffer.cpp
+++ b/libkms++/dumbframebuffer.cpp
@@ -136,7 +136,7 @@ void DumbFramebuffer::Create(uint32_t width, uint32_t height, uint32_t format)
        if (r)
                throw std::invalid_argument("foo");
 
-       m_id = id;
+       set_id(id);
 }
 
 void DumbFramebuffer::Destroy()

diff --git a/libkms++/extframebuffer.cpp b/libkms++/extframebuffer.cpp
index de9d737598b7fe78ebc8c76113a62b4c463d3602..8b0af9f42ef50b734c483f18c2a00b20027f2ae2 100644 (file)
--- a/libkms++/extframebuffer.cpp
+++ b/libkms++/extframebuffer.cpp
@@ -19,7 +19,8 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, uint
        int r = drmModeAddFB(card.fd(), width, height, depth, bpp, stride, handle, &id);
        if (r)
                throw invalid_argument("fob");
-       m_id = id;
+
+       set_id(id);
 }
 
 ExtFramebuffer::~ExtFramebuffer()