remove print_short

diff --git a/libkms++/card.cpp b/libkms++/card.cpp
index 06a237f6dd7fffafcd21b1901370da6af3b5d38d..2bb6673b494901614e72c89c75b92dc5944d0be5 100644 (file)
--- a/libkms++/card.cpp
+++ b/libkms++/card.cpp
@@ -132,25 +132,6 @@ void Card::restore_modes()
                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 prop : m_properties) {

diff --git a/libkms++/card.h b/libkms++/card.h
index 7232467ce6592a14957d6047d7f725f06bfe9e29..bbe34e28a15c65e9d09e5c6f812e92143c0333aa 100644 (file)
--- a/libkms++/card.h
+++ b/libkms++/card.h
@@ -35,8 +35,6 @@ public:
        bool has_atomic() const { return m_has_atomic; }
        bool has_has_universal_planes() const { return m_has_universal_planes; }
 
-       void print_short() const;
-
        const std::vector<Connector*> get_connectors() const { return m_connectors; }
        const std::vector<Encoder*> get_encoders() const { return m_encoders; }
        const std::vector<Crtc*> get_crtcs() const { return m_crtcs; }

diff --git a/libkms++/connector.cpp b/libkms++/connector.cpp
index eca3edd8c258a88c01b8bd337dafbab04dc790e5..6ab590e2476a3cc9a3473085c6e0608e3b4f09b6 100644 (file)
--- a/libkms++/connector.cpp
+++ b/libkms++/connector.cpp
@@ -96,14 +96,6 @@ void Connector::restore_mode()
                m_saved_crtc->restore_mode(this);
 }
 
-void Connector::print_short() const
-{
-       auto c = m_priv->drm_connector;
-
-       printf("Connector %d, %s, %dx%dmm, %s\n", id(), m_fullname.c_str(),
-              c->mmWidth, c->mmHeight, connection_str.at(c->connection).c_str());
-}
-
 Videomode Connector::get_default_mode() const
 {
        drmModeModeInfo drmmode = m_priv->drm_connector->modes[0];

diff --git a/libkms++/connector.h b/libkms++/connector.h
index f586f4e316c48724c401da4763bcc93e9f4f7d5f..9776be35258c940609c22d6b3d65ce187ce8631e 100644 (file)
--- a/libkms++/connector.h
+++ b/libkms++/connector.h
@@ -26,8 +26,6 @@ class Connector : public DrmObject
 {
        friend class Card;
 public:
-       void print_short() const;
-
        Videomode get_default_mode() const;
 
        Videomode get_mode(const std::string& mode) const;

diff --git a/libkms++/crtc.cpp b/libkms++/crtc.cpp
index 321670c96e77556fe09fbb7149f9491db576c2d6..6d5ee02a891248903a3a399e91a761c366aa02d0 100644 (file)
--- a/libkms++/crtc.cpp
+++ b/libkms++/crtc.cpp
@@ -50,14 +50,6 @@ void Crtc::restore_mode(Connector* conn)
                       conns, 1, &c->mode);
 }
 
-void Crtc::print_short() const
-{
-       auto c  = m_priv->drm_crtc;
-
-       printf("Crtc %d, %d,%d %dx%d\n", id(),
-              c->x, c->y, c->width, c->height);
-}
-
 int Crtc::set_mode(Connector* conn, Framebuffer& fb, const Videomode& mode)
 {
        uint32_t conns[] = { conn->id() };

diff --git a/libkms++/crtc.h b/libkms++/crtc.h
index 7581302e46f08889e32603e841a3c1f31d6fa47e..ec376e45569bbf87a9eb215435ec3ec9426777ac 100644 (file)
--- a/libkms++/crtc.h
+++ b/libkms++/crtc.h
@@ -14,8 +14,6 @@ class Crtc : public DrmObject
        friend class Card;
        friend class Connector;
 public:
-       void print_short() const;
-
        const std::vector<Plane*>& get_possible_planes() const { return m_possible_planes; }
 
        int set_mode(Connector* conn, Framebuffer& fb, const Videomode& mode);

diff --git a/libkms++/drmobject.cpp b/libkms++/drmobject.cpp
index 175ee169ccf630236aafc864ca73a1a1cefa86f3..063ae327faba5d49413055344ea7a8ffc6dc0165 100644 (file)
--- a/libkms++/drmobject.cpp
+++ b/libkms++/drmobject.cpp
@@ -45,14 +45,6 @@ void DrmObject::refresh_props()
        drmModeFreeObjectProperties(props);
 }
 
-void DrmObject::print_props() const
-{
-       for (auto it = m_prop_values.begin(); it != m_prop_values.end(); ++it) {
-               cout << "\t" << card().get_prop(it->first)->name() <<
-                       " = " << it->second << endl;
-       }
-}
-
 uint64_t DrmObject::get_prop_value(uint32_t id) const
 {
        return m_prop_values.at(id);

diff --git a/libkms++/drmobject.h b/libkms++/drmobject.h
index 9ce2adc5ee32a1fb7c85ecf6c033be0a5277e01e..2ff1b0493543ca4b051fe83e447e20ae20327dff 100644 (file)
--- a/libkms++/drmobject.h
+++ b/libkms++/drmobject.h
@@ -14,9 +14,6 @@ public:
        DrmObject(const DrmObject& other) = delete;
        DrmObject& operator=(const DrmObject& other) = delete;
 
-       virtual void print_short() const = 0;
-       void print_props() const;
-
        uint32_t id() const { return m_id; }
        Card& card() const { return m_card; }
 

diff --git a/libkms++/dumbframebuffer.cpp b/libkms++/dumbframebuffer.cpp
index fa5562cea1f21df701cb1507982862527c428d1a..d1e40ffb028a10cce6bacf985413f8092840aae7 100644 (file)
--- a/libkms++/dumbframebuffer.cpp
+++ b/libkms++/dumbframebuffer.cpp
@@ -33,11 +33,6 @@ DumbFramebuffer::~DumbFramebuffer()
        Destroy();
 }
 
-void DumbFramebuffer::print_short() const
-{
-       printf("DumbFramebuffer %d\n", id());
-}
-
 struct FormatPlaneInfo
 {
        uint8_t bitspp; /* bits per (macro) pixel */

diff --git a/libkms++/dumbframebuffer.h b/libkms++/dumbframebuffer.h
index 49cf8a0daa352fff72f216a9440580c65fe97388..0ee0406342d2089d42dca19309985989dccf0c8e 100644 (file)
--- a/libkms++/dumbframebuffer.h
+++ b/libkms++/dumbframebuffer.h
@@ -12,8 +12,6 @@ public:
        DumbFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format);
        virtual ~DumbFramebuffer();
 
-       void print_short() const;
-
        PixelFormat format() const { return m_format; }
        unsigned num_planes() const { return m_num_planes; }
 

diff --git a/libkms++/encoder.cpp b/libkms++/encoder.cpp
index 6f79e4fba6446b1db1382ed77dc4daf17dacd10b..ffef897044383b48c8f8318761c0e56259eeb4de 100644 (file)
--- a/libkms++/encoder.cpp
+++ b/libkms++/encoder.cpp
@@ -44,14 +44,6 @@ Encoder::~Encoder()
        delete m_priv;
 }
 
-void Encoder::print_short() const
-{
-       auto e = m_priv->drm_encoder;
-
-       printf("Encoder %d, %d\n", id(),
-              e->encoder_type);
-}
-
 Crtc* Encoder::get_crtc() const
 {
        if (m_priv->drm_encoder->crtc_id)

diff --git a/libkms++/encoder.h b/libkms++/encoder.h
index 609e136da80fa5cde34ae7477baa2a2a592860da..956a4c7c7a2804f200bba1850e1b697b98d0b30f 100644 (file)
--- a/libkms++/encoder.h
+++ b/libkms++/encoder.h
@@ -12,8 +12,6 @@ class Encoder : public DrmObject
 {
        friend class Card;
 public:
-       void print_short() const;
-
        Crtc* get_crtc() const;
        std::vector<Crtc*> get_possible_crtcs() const;
 

diff --git a/libkms++/extframebuffer.cpp b/libkms++/extframebuffer.cpp
index 4c90a4e33d09cd1ea997522d53529b21201716c8..35fead8f1cf86e932c252eb8f7c0f49059e19864 100644 (file)
--- a/libkms++/extframebuffer.cpp
+++ b/libkms++/extframebuffer.cpp
@@ -40,9 +40,4 @@ ExtFramebuffer::~ExtFramebuffer()
        drmModeRmFB(card().fd(), id());
 }
 
-void ExtFramebuffer::print_short() const
-{
-       printf("Framebuffer %d\n", id());
-}
-
 }

diff --git a/libkms++/extframebuffer.h b/libkms++/extframebuffer.h
index 82909c50110d5cabf9bec0b9fb2f28a42b8321f5..b83bbd5499eebdebf58f6fd20377d1112faacf80 100644 (file)
--- a/libkms++/extframebuffer.h
+++ b/libkms++/extframebuffer.h
@@ -14,8 +14,6 @@ public:
                       uint32_t handles[4], uint32_t pitches[4], uint32_t offsets[4]);
        virtual ~ExtFramebuffer();
 
-       void print_short() const;
-
 private:
        uint32_t m_pitch;
        uint32_t m_bpp;

diff --git a/libkms++/framebuffer.cpp b/libkms++/framebuffer.cpp
index bc1fd510f99e09f95f667af98b229451f2a27e6f..a7e5ad6921f7ad45dadbda4f53e9af0cb5949154 100644 (file)
--- a/libkms++/framebuffer.cpp
+++ b/libkms++/framebuffer.cpp
@@ -27,9 +27,4 @@ Framebuffer::Framebuffer(Card& card, uint32_t id)
        drmModeFreeFB(fb);
 }
 
-void Framebuffer::print_short() const
-{
-       printf("Framebuffer %d\n", id());
-}
-
 }

diff --git a/libkms++/framebuffer.h b/libkms++/framebuffer.h
index 33349d87072dbc6b447450af6c5ed70470cbcd49..12374ae87118054f5ec42134afa31bff8756cab9 100644 (file)
--- a/libkms++/framebuffer.h
+++ b/libkms++/framebuffer.h
@@ -12,8 +12,6 @@ public:
 
        uint32_t width() const { return m_width; }
        uint32_t height() const { return m_height; }
-
-       virtual void print_short() const;
 protected:
        Framebuffer(Card& card, int width, int height);
 

diff --git a/libkms++/plane.cpp b/libkms++/plane.cpp
index 3ad3ddfa62c8503d25e8f4146becb684bd1dc2fb..b4934b8459bd6c544f21203ac64dc04d0fdbc4e1 100644 (file)
--- a/libkms++/plane.cpp
+++ b/libkms++/plane.cpp
@@ -32,26 +32,6 @@ Plane::~Plane()
        delete m_priv;
 }
 
-void Plane::print_short() const
-{
-       auto p = m_priv->drm_plane;
-
-       printf("Plane %d, %d modes, %d,%d -> %dx%d\n", id(),
-              p->count_formats,
-              p->crtc_x, p->crtc_y, p->x, p->y);
-
-       printf("\t");
-       for (unsigned i = 0; i < p->count_formats; ++i) {
-               uint32_t f = p->formats[i];
-               printf("%c%c%c%c ",
-                      (f >> 0) & 0xff,
-                      (f >> 8) & 0xff,
-                      (f >> 16) & 0xff,
-                      (f >> 24) & 0xff);
-       }
-       printf("\n");
-}
-
 bool Plane::supports_crtc(Crtc* crtc) const
 {
        return m_priv->drm_plane->possible_crtcs & (1 << crtc->idx());

diff --git a/libkms++/plane.h b/libkms++/plane.h
index 2faca78d3e25cfb0ce351d3715c30489315b3f4c..91c403f9949a71322335eb4cd47c34be666aaf5e 100644 (file)
--- a/libkms++/plane.h
+++ b/libkms++/plane.h
@@ -18,8 +18,6 @@ class Plane : public DrmObject
 {
        friend class Card;
 public:
-       void print_short() const;
-
        bool supports_crtc(Crtc* crtc) const;
        bool supports_format(PixelFormat fmt) const;
 

diff --git a/libkms++/property.cpp b/libkms++/property.cpp
index 3b8a0b805ec1d8a774aa4cf34246ba59762bd60a..5ec6bfa36096fcf3f1bcd31e12b36119bef84b79 100644 (file)
--- a/libkms++/property.cpp
+++ b/libkms++/property.cpp
@@ -27,11 +27,6 @@ Property::~Property()
        delete m_priv;
 }
 
-void Property::print_short() const
-{
-       printf("Property %d, %s\n", id(), name().c_str());
-}
-
 const string& Property::name() const
 {
        return m_name;

diff --git a/libkms++/property.h b/libkms++/property.h
index 4cb265351a19c16c9cb6da69874f89be5d9ea527..148e325c1bb08e2c6200ff457045861c2ba5aec4 100644 (file)
--- a/libkms++/property.h
+++ b/libkms++/property.h
@@ -11,8 +11,6 @@ class Property : public DrmObject
 {
        friend class Card;
 public:
-       void print_short() const;
-
        const std::string& name() const;
 
        const std::string to_str(uint64_t val) const;

diff --git a/lua/test.lua b/lua/test.lua
index 94559445b4a5d4c3154233502857555ac0e59f7c..c3de15ccfd5f718a6d680824517ac9904796c19a 100755 (executable)
--- a/lua/test.lua
+++ b/lua/test.lua
@@ -4,7 +4,6 @@ require("libluakms")
 require("bit32")
 
 card = libluakms.Card()
-card:print_short()
 
 conn = card:get_first_connected_connector()
 

diff --git a/py/test.py b/py/test.py
index a4a4f8da26fadc8627070831ca1bada050537703..ac3cd7bedf9f212e82e8e17d7120cf2d4bbf8357 100755 (executable)
--- a/py/test.py
+++ b/py/test.py
@@ -3,7 +3,6 @@
 import pykms
 
 card = pykms.Card()
-card.print_short()
 
 conn = card.get_first_connected_connector()
 

diff --git a/tests/db.cpp b/tests/db.cpp
index 6131263e63b148b5602e5f13c81c39454f11f92c..4356e97b8bdc45689ce6c3413f09093c43ed4557 100644 (file)
--- a/tests/db.cpp
+++ b/tests/db.cpp
@@ -181,8 +181,6 @@ int main()
        if (card.master() == false)
                printf("Not DRM master, modeset may fail\n");
 
-       //card.print_short();
-
        vector<OutputFlipHandler*> outputs;
 
        for (auto pipe : card.get_connected_pipelines())

diff --git a/tests/testpat.cpp b/tests/testpat.cpp
index 13fea9e8e24e5caa898bdaa00155184c196664c8..85c67a3938bc76e77036e75be2ae37630abd547a 100644 (file)
--- a/tests/testpat.cpp
+++ b/tests/testpat.cpp
@@ -21,8 +21,6 @@ int main(int argc, char **argv)
        if (card.master() == false)
                printf("Not DRM master, modeset may fail\n");
 
-       //card.print_short();
-
        auto pipes = card.get_connected_pipelines();
 
        vector<Framebuffer*> fbs;