qtvideosink: Distribute classes into subdirectories for easier code navigation

20 files changed, 25 insertions, 24 deletions

diff --git a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt
index 86b3884..6808a25 100644
--- a/elements/gstqtvideosink/CMakeLists.txt
+++ b/elements/gstqtvideosink/CMakeLists.txt
@@ -4,12 +4,13 @@ glib2_genmarshal(gstqtvideosinkmarshal
 )
 
 set(GstQtVideoSink_SRCS
-    utils.cpp
-    bufferformat.cpp
-    genericsurfacepainter.cpp
+    utils/utils.cpp
+    utils/bufferformat.cpp
 
-    qtvideosinkdelegate.cpp
-    qwidgetvideosinkdelegate.cpp
+    painters/genericsurfacepainter.cpp
+
+    delegates/qtvideosinkdelegate.cpp
+    delegates/qwidgetvideosinkdelegate.cpp
 
     gstqtvideosinkplugin.cpp
     gstqtvideosinkbase.cpp
@@ -21,12 +22,12 @@ set(GstQtVideoSink_SRCS
 
 if (Qt4or5_OpenGL_FOUND AND (OPENGL_FOUND OR OPENGLES2_FOUND))
     set(GstQtVideoSink_GL_SRCS
-        openglsurfacepainter.cpp
+        painters/openglsurfacepainter.cpp
         gstqtglvideosinkbase.cpp
         gstqtglvideosink.cpp
     )
     set(GstQtVideoSink_test_GL_SRCS
-        openglsurfacepainter.cpp
+        painters/openglsurfacepainter.cpp
     )
 
     if (OPENGLES2_FOUND)
@@ -64,9 +65,9 @@ install(TARGETS gst${QTVIDEOSINK_NAME} DESTINATION ${QTGSTREAMER_GST_PLUGINS_INS
 if (QTGSTREAMER_TESTS)
     add_executable(qtvideosink_autotest
         autotest.cpp
-        utils.cpp
-        bufferformat.cpp
-        genericsurfacepainter.cpp
+        utils/utils.cpp
+        utils/bufferformat.cpp
+        painters/genericsurfacepainter.cpp
         ${GstQtVideoSink_test_GL_SRCS}
     )
     target_link_libraries(qtvideosink_autotest
diff --git a/elements/gstqtvideosink/autotest.cpp b/elements/gstqtvideosink/autotest.cpp
index 5495f89..7aa2e40 100644
--- a/elements/gstqtvideosink/autotest.cpp
+++ b/elements/gstqtvideosink/autotest.cpp
@@ -36,12 +36,12 @@
 
 
 #ifndef GST_QT_VIDEO_SINK_NO_OPENGL
-# include "openglsurfacepainter.h"
+# include "painters/openglsurfacepainter.h"
 # include <QGLWidget>
 # include <QGLPixelBuffer>
 #endif
 
-#include "genericsurfacepainter.h"
+#include "painters/genericsurfacepainter.h"
 
 
 struct PipelineDeleter
diff --git a/elements/gstqtvideosink/qtvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qtvideosinkdelegate.cpp
index 24d581e..228f3f0 100644
--- a/elements/gstqtvideosink/qtvideosinkdelegate.cpp
+++ b/elements/gstqtvideosink/delegates/qtvideosinkdelegate.cpp
@@ -16,8 +16,8 @@
 */
 
 #include "qtvideosinkdelegate.h"
-#include "genericsurfacepainter.h"
-#include "openglsurfacepainter.h"
+#include "../painters/genericsurfacepainter.h"
+#include "../painters/openglsurfacepainter.h"
 #include "gstqtvideosink.h"
 #include "gstqtglvideosink.h"
 
diff --git a/elements/gstqtvideosink/qtvideosinkdelegate.h b/elements/gstqtvideosink/delegates/qtvideosinkdelegate.h
index 5ae342f..31c1e78 100644
--- a/elements/gstqtvideosink/qtvideosinkdelegate.h
+++ b/elements/gstqtvideosink/delegates/qtvideosinkdelegate.h
@@ -19,8 +19,8 @@
 #define QT_VIDEO_SINK_DELEGATE_H
 
 #include "gstqtvideosinkbase.h"
-#include "bufferformat.h"
-#include "abstractsurfacepainter.h"
+#include "../utils/bufferformat.h"
+#include "../painters/abstractsurfacepainter.h"
 
 #include <QObject>
 #include <QEvent>
diff --git a/elements/gstqtvideosink/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
index 336bf76..336bf76 100644
--- a/elements/gstqtvideosink/qwidgetvideosinkdelegate.cpp
+++ b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
diff --git a/elements/gstqtvideosink/qwidgetvideosinkdelegate.h b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h
index 7e54395..7e54395 100644
--- a/elements/gstqtvideosink/qwidgetvideosinkdelegate.h
+++ b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h
diff --git a/elements/gstqtvideosink/gstqtglvideosink.cpp b/elements/gstqtvideosink/gstqtglvideosink.cpp
index f7786ae..5cbf204 100644
--- a/elements/gstqtvideosink/gstqtglvideosink.cpp
+++ b/elements/gstqtvideosink/gstqtglvideosink.cpp
@@ -17,7 +17,7 @@
 
 #include "gstqtglvideosink.h"
 #include "gstqtvideosinkmarshal.h"
-#include "qtvideosinkdelegate.h"
+#include "delegates/qtvideosinkdelegate.h"
 
 
 guint GstQtGLVideoSink::s_signals[];
diff --git a/elements/gstqtvideosink/gstqtglvideosinkbase.cpp b/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
index 1894105..f0d466e 100644
--- a/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
+++ b/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
@@ -16,8 +16,8 @@
 */
 
 #include "gstqtglvideosinkbase.h"
-#include "openglsurfacepainter.h"
-#include "qtvideosinkdelegate.h"
+#include "painters/openglsurfacepainter.h"
+#include "delegates/qtvideosinkdelegate.h"
 
 const char * const GstQtGLVideoSinkBase::s_colorbalance_labels[] = {
     "contrast", "brightness", "hue", "saturation"
diff --git a/elements/gstqtvideosink/gstqtvideosink.cpp b/elements/gstqtvideosink/gstqtvideosink.cpp
index 903d756..9ce8cae 100644
--- a/elements/gstqtvideosink/gstqtvideosink.cpp
+++ b/elements/gstqtvideosink/gstqtvideosink.cpp
@@ -17,7 +17,7 @@
 
 #include "gstqtvideosink.h"
 #include "gstqtvideosinkmarshal.h"
-#include "qtvideosinkdelegate.h"
+#include "delegates/qtvideosinkdelegate.h"
 
 
 guint GstQtVideoSink::s_signals[];
diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
index 138eed6..26e5084 100644
--- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp
+++ b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
@@ -16,8 +16,8 @@
 */
 
 #include "gstqtvideosinkbase.h"
-#include "qtvideosinkdelegate.h"
-#include "genericsurfacepainter.h"
+#include "delegates/qtvideosinkdelegate.h"
+#include "painters/genericsurfacepainter.h"
 #include <cstring>
 #include <QCoreApplication>
 
diff --git a/elements/gstqtvideosink/gstqwidgetvideosink.cpp b/elements/gstqtvideosink/gstqwidgetvideosink.cpp
index 8a27092..e922cbe 100644
--- a/elements/gstqtvideosink/gstqwidgetvideosink.cpp
+++ b/elements/gstqtvideosink/gstqwidgetvideosink.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "gstqwidgetvideosink.h"
-#include "qwidgetvideosinkdelegate.h"
+#include "delegates/qwidgetvideosinkdelegate.h"
 
 DEFINE_TYPE(GstQWidgetVideoSink, GST_TYPE_QT_VIDEO_SINK_BASE)
 
diff --git a/elements/gstqtvideosink/abstractsurfacepainter.h b/elements/gstqtvideosink/painters/abstractsurfacepainter.h
index 40cd1cb..3e90a77 100644
--- a/elements/gstqtvideosink/abstractsurfacepainter.h
+++ b/elements/gstqtvideosink/painters/abstractsurfacepainter.h
@@ -17,7 +17,7 @@
 #ifndef ABSTRACTSURFACEPAINTER_H
 #define ABSTRACTSURFACEPAINTER_H
 
-#include "bufferformat.h"
+#include "../utils/bufferformat.h"
 #include <QRectF>
 
 class QPainter;
diff --git a/elements/gstqtvideosink/genericsurfacepainter.cpp b/elements/gstqtvideosink/painters/genericsurfacepainter.cpp
index 864ea18..864ea18 100644
--- a/elements/gstqtvideosink/genericsurfacepainter.cpp
+++ b/elements/gstqtvideosink/painters/genericsurfacepainter.cpp
diff --git a/elements/gstqtvideosink/genericsurfacepainter.h b/elements/gstqtvideosink/painters/genericsurfacepainter.h
index 66325df..66325df 100644
--- a/elements/gstqtvideosink/genericsurfacepainter.h
+++ b/elements/gstqtvideosink/painters/genericsurfacepainter.h
diff --git a/elements/gstqtvideosink/openglsurfacepainter.cpp b/elements/gstqtvideosink/painters/openglsurfacepainter.cpp
index b3598ec..b3598ec 100644
--- a/elements/gstqtvideosink/openglsurfacepainter.cpp
+++ b/elements/gstqtvideosink/painters/openglsurfacepainter.cpp
diff --git a/elements/gstqtvideosink/openglsurfacepainter.h b/elements/gstqtvideosink/painters/openglsurfacepainter.h
index c1e2dd0..c1e2dd0 100644
--- a/elements/gstqtvideosink/openglsurfacepainter.h
+++ b/elements/gstqtvideosink/painters/openglsurfacepainter.h
diff --git a/elements/gstqtvideosink/bufferformat.cpp b/elements/gstqtvideosink/utils/bufferformat.cpp
index 09b8a89..09b8a89 100644
--- a/elements/gstqtvideosink/bufferformat.cpp
+++ b/elements/gstqtvideosink/utils/bufferformat.cpp
diff --git a/elements/gstqtvideosink/bufferformat.h b/elements/gstqtvideosink/utils/bufferformat.h
index 2534703..2534703 100644
--- a/elements/gstqtvideosink/bufferformat.h
+++ b/elements/gstqtvideosink/utils/bufferformat.h
diff --git a/elements/gstqtvideosink/utils.cpp b/elements/gstqtvideosink/utils/utils.cpp
index c62100b..c62100b 100644
--- a/elements/gstqtvideosink/utils.cpp
+++ b/elements/gstqtvideosink/utils/utils.cpp
diff --git a/elements/gstqtvideosink/utils.h b/elements/gstqtvideosink/utils/utils.h
index a2924a9..a2924a9 100644
--- a/elements/gstqtvideosink/utils.h
+++ b/elements/gstqtvideosink/utils/utils.h