libkmstest: cleanup headers

diff --git a/libkmstest/colorbar.h b/libkmstest/colorbar.h
deleted file mode 100644 (file)
index a47d64d..0000000
--- a/libkmstest/colorbar.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-namespace kms
-{
-void draw_color_bar(kms::DumbFramebuffer& buf, int old_xpos, int xpos, int width);
-}

diff --git a/libkmstest/conv.cpp b/libkmstest/conv.cpp
index b716020de2bc26afed447cceb60cefbe3656f99d..f2f19ac1fa92922f684c3c417fad0b0faaeb2e24 100644 (file)
--- a/libkmstest/conv.cpp
+++ b/libkmstest/conv.cpp
@@ -1,9 +1,8 @@
 #include <drm_fourcc.h>
 #include <stdexcept>
 
-#include "dumbframebuffer.h"
+#include "kms++.h"
 #include "color.h"
-#include "conv.h"
 
 namespace kms
 {

diff --git a/libkmstest/conv.h b/libkmstest/conv.h
deleted file mode 100644 (file)
index 105aaf0..0000000
--- a/libkmstest/conv.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace kms
-{
-class DumbFramebuffer;
-
-void color_convert(DumbFramebuffer& dst, const DumbFramebuffer &src);
-}

diff --git a/libkmstest/kmstest.h b/libkmstest/kmstest.h
new file mode 100644 (file)
index 0000000..a77f0ff
--- /dev/null
+++ b/libkmstest/kmstest.h
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace kms
+{
+class DumbFramebuffer;
+
+void color_convert(DumbFramebuffer& dst, const DumbFramebuffer &src);
+void draw_color_bar(kms::DumbFramebuffer& buf, int old_xpos, int xpos, int width);
+void draw_test_pattern(DumbFramebuffer& fb);
+}

diff --git a/libkmstest/test.h b/libkmstest/test.h
index fbc4727d3d1e396848519b9d1e2a6f324f690a6e..56ceb2783278a6a82db916566f8e1e9a4f201012 100644 (file)
--- a/libkmstest/test.h
+++ b/libkmstest/test.h
@@ -1,9 +1,7 @@
 #pragma once
 
 #include "color.h"
-#include "conv.h"
-#include "testpat.h"
-#include "colorbar.h"
+#include "kmstest.h"
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 

diff --git a/libkmstest/testpat.cpp b/libkmstest/testpat.cpp
index 958d78507b3a646e3efbd59d0f62108ad55aadf3..1516369d0f533f3edb037481b096d813bc8951b9 100644 (file)
--- a/libkmstest/testpat.cpp
+++ b/libkmstest/testpat.cpp
@@ -9,9 +9,7 @@
 #include <drm.h>
 #include <drm_mode.h>
 
-#include "card.h"
-#include "dumbframebuffer.h"
-#include "testpat.h"
+#include "kms++.h"
 #include "color.h"
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

diff --git a/libkmstest/testpat.h b/libkmstest/testpat.h
deleted file mode 100644 (file)
index e051f4a..0000000
--- a/libkmstest/testpat.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-namespace kms
-{
-void draw_test_pattern(DumbFramebuffer& fb);
-}

diff --git a/lua/luakms.i b/lua/luakms.i
index 5530f845eaa445a26539551fff54073c6c10feeb..cdf802b9e2c38d2dcaf29be6a2807ae87362a0ff 100644 (file)
--- a/lua/luakms.i
+++ b/lua/luakms.i
@@ -2,7 +2,7 @@
 %{
 #include "kms++.h"
 
-#include "testpat.h"
+#include "kmstest.h"
 
 using namespace kms;
 %}
@@ -22,4 +22,4 @@ using namespace kms;
 %include "connector.h"
 %include "encoder.h"
 
-%include "testpat.h"
+%include "kmstest.h"

diff --git a/py/pykms.i b/py/pykms.i
index c71aceda1d636e75d8dacdb00ff67c18a55ac225..1dcd0ca0339f9a101b99482e1ada61e98bde2419 100644 (file)
--- a/py/pykms.i
+++ b/py/pykms.i
@@ -2,7 +2,7 @@
 %{
 #include "kms++.h"
 
-#include "testpat.h"
+#include "kmstest.h"
 
 using namespace kms;
 %}
@@ -22,4 +22,4 @@ using namespace kms;
 %include "connector.h"
 %include "encoder.h"
 
-%include "testpat.h"
+%include "kmstest.h"