gl: Move GstGLMixer to the plugin for now

It depends on GstAggregator and we don't want to install headers
for that yet.

https://bugzilla.gnome.org/show_bug.cgi?id=732207

11 files changed, 7 insertions, 42 deletions

diff --git a/docs/libs/gst-plugins-bad-libs-docs.sgml b/docs/libs/gst-plugins-bad-libs-docs.sgml
index 54a078a62..8c1102635 100644
--- a/docs/libs/gst-plugins-bad-libs-docs.sgml
+++ b/docs/libs/gst-plugins-bad-libs-docs.sgml
@@ -85,7 +85,6 @@
       <xi:include href="xml/gstglfilter.xml"/>
       <xi:include href="xml/gstglframebuffer.xml"/>
       <xi:include href="xml/gstglmemory.xml"/>
-      <xi:include href="xml/gstglmixer.xml"/>
       <xi:include href="xml/gstglshader.xml"/>
       <xi:include href="xml/gstglupload.xml"/>
       <xi:include href="xml/gstgluploadmeta.xml"/>
diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt
index 38c36f259..d07f6d6d6 100644
--- a/docs/libs/gst-plugins-bad-libs-sections.txt
+++ b/docs/libs/gst-plugins-bad-libs-sections.txt
@@ -1042,38 +1042,6 @@ GST_CAPS_FEATURE_MEMORY_EGL_IMAGE
 </SECTION>
 
 <SECTION>
-<FILE>gstglmixer</FILE>
-GstGLMixerPad
-GstGLMixerPadClass
-GstGLMixerCollect
-<TITLE>GstGLMixer</TITLE>
-GstGLMixer
-GstGLMixerClass
-GstGLMixerProcessFunc
-GstGLMixerSetCaps
-GstGLMixerReset
-GstGLMixerProcessTextures
-GstGLMixerFrameData
-gst_gl_mixer_process_textures
-gst_gl_mixer_set_pad_type
-<SUBSECTION Standard>
-GstGLMixerPrivate
-GST_GL_MIXER
-GST_GL_MIXER_CLASS
-GST_GL_MIXER_GET_CLASS
-GST_GL_MIXER_PAD
-GST_GL_MIXER_PAD_CLASS
-gst_gl_mixer_get_type
-gst_gl_mixer_pad_get_type
-GST_IS_GL_MIXER
-GST_IS_GL_MIXER_CLASS
-GST_IS_GL_MIXER_PAD
-GST_IS_GL_MIXER_PAD_CLASS
-GST_TYPE_GL_MIXER
-GST_TYPE_GL_MIXER_PAD
-</SECTION>
-
-<SECTION>
 <FILE>gstglshader</FILE>
 gst_gl_shader_error_quark
 GST_GL_SHADER_ERROR
diff --git a/docs/libs/gst-plugins-bad-libs.types b/docs/libs/gst-plugins-bad-libs.types
index 29179d97d..67ce098b4 100644
--- a/docs/libs/gst-plugins-bad-libs.types
+++ b/docs/libs/gst-plugins-bad-libs.types
@@ -33,7 +33,6 @@ gst_gl_display_get_type
 gst_gl_context_get_type
 gst_gl_filter_get_type
 gst_gl_shader_get_type
-gst_gl_mixer_get_type
 gst_gl_buffer_pool_get_type
 gst_gl_allocator_get_type
 gst_gl_window_get_type
diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
index 7ec63b309..a92efb8c2 100644
--- a/ext/gl/Makefile.am
+++ b/ext/gl/Makefile.am
@@ -25,6 +25,9 @@ OPENGL_SOURCES =  \
 	gltestsrc.h \
 	gstgltestsrc.c \
 	gstgltestsrc.h \
+	gstglmixer.c \
+	gstglmixer.h \
+	gstglmixerpad.h \
 	gstglmosaic.c \
 	gstglmosaic.h \
 	effects/gstgleffectscurves.h \
diff --git a/gst-libs/gst/gl/gstglmixer.c b/ext/gl/gstglmixer.c
index 626eb967c..626eb967c 100644
--- a/gst-libs/gst/gl/gstglmixer.c
+++ b/ext/gl/gstglmixer.c
diff --git a/gst-libs/gst/gl/gstglmixer.h b/ext/gl/gstglmixer.h
index 7e66acc06..a9e3a3c6c 100644
--- a/gst-libs/gst/gl/gstglmixer.h
+++ b/ext/gl/gstglmixer.h
@@ -24,7 +24,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/gl/gl.h>
-#include <gst/gl/gstglmixerpad.h>
+#include "gstglmixerpad.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglmixerpad.h b/ext/gl/gstglmixerpad.h
index d2fb8290c..d2fb8290c 100644
--- a/gst-libs/gst/gl/gstglmixerpad.h
+++ b/ext/gl/gstglmixerpad.h
diff --git a/ext/gl/gstglmosaic.h b/ext/gl/gstglmosaic.h
index 1da9dbe29..49c99e775 100644
--- a/ext/gl/gstglmosaic.h
+++ b/ext/gl/gstglmosaic.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_MOSAIC_H_
 #define _GST_GL_MOSAIC_H_
 
-#include <gst/gl/gstglmixer.h>
+#include "gstglmixer.h"
 
 G_BEGIN_DECLS
 
diff --git a/ext/gl/gstglvideomixer.h b/ext/gl/gstglvideomixer.h
index 69a077100..ae2f367a8 100644
--- a/ext/gl/gstglvideomixer.h
+++ b/ext/gl/gstglvideomixer.h
@@ -21,8 +21,8 @@
 #ifndef _GST_GL_VIDEO_MIXER_H_
 #define _GST_GL_VIDEO_MIXER_H_
 
-#include <gst/gl/gstglmixer.h>
-#include <gst/gl/gstglmixerpad.h>
+#include "gstglmixer.h"
+#include "gstglmixerpad.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index d201e3ec3..61597c107 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -14,7 +14,6 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \
 	gstglmemory.c \
 	gstglbufferpool.c \
 	gstglfilter.c \
-	gstglmixer.c \
         gstglshader.c \
         gstglshadervariables.c \
         gstglcolorconvert.c \
@@ -35,8 +34,6 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
 	gstglmemory.h \
 	gstglbufferpool.h \
 	gstglfilter.h \
-	gstglmixer.h \
-	gstglmixerpad.h \
 	gstglshadervariables.h \
 	gstglshader.h \
 	gstglcolorconvert.h \
diff --git a/gst-libs/gst/gl/gl.h b/gst-libs/gst/gl/gl.h
index 4aee9c9e1..d5debe64d 100644
--- a/gst-libs/gst/gl/gl.h
+++ b/gst-libs/gst/gl/gl.h
@@ -43,7 +43,6 @@
 #include <gst/gl/gstglbufferpool.h>
 #include <gst/gl/gstglframebuffer.h>
 #include <gst/gl/gstglfilter.h>
-#include <gst/gl/gstglmixer.h>
 #include <gst/gl/gstglshadervariables.h>
 
 #endif /* __GST_GL_H__ */