From 690a18ee09b1bc3bfd3abeacb78a2e099366c967 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sat, 27 Oct 2018 12:37:07 +0100
Subject: [PATCH] compositor: Remove extra header for the pad declaration

There's no reason for having this separate apart from making things less
discoverable.
---
 gst/compositor/Makefile.am     |  3 +-
 gst/compositor/compositor.c    |  1 -
 gst/compositor/compositor.h    | 37 +++++++++++++++++++++++
 gst/compositor/compositorpad.h | 68 ------------------------------------------
 4 files changed, 38 insertions(+), 71 deletions(-)
 delete mode 100644 gst/compositor/compositorpad.h

diff --git a/gst/compositor/Makefile.am b/gst/compositor/Makefile.am
index 6b98b78..193d153 100644
--- a/gst/compositor/Makefile.am
+++ b/gst/compositor/Makefile.am
@@ -25,5 +25,4 @@ libgstcompositor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 # headers we need but don't want installed
 noinst_HEADERS = \
 	blend.h \
-	compositor.h \
-	compositorpad.h
+	compositor.h
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c
index c831738..d036d68 100644
--- a/gst/compositor/compositor.c
+++ b/gst/compositor/compositor.c
@@ -93,7 +93,6 @@
 #include <string.h>
 
 #include "compositor.h"
-#include "compositorpad.h"
 
 #ifdef DISABLE_ORC
 #define orc_memset memset
diff --git a/gst/compositor/compositor.h b/gst/compositor/compositor.h
index d8cefa3..37ffcb5 100644
--- a/gst/compositor/compositor.h
+++ b/gst/compositor/compositor.h
@@ -39,9 +39,22 @@ G_BEGIN_DECLS
 #define GST_IS_COMPOSITOR_CLASS(klass) \
         (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COMPOSITOR))
 
+#define GST_TYPE_COMPOSITOR_PAD (gst_compositor_pad_get_type())
+#define GST_COMPOSITOR_PAD(obj) \
+        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COMPOSITOR_PAD, GstCompositorPad))
+#define GST_COMPOSITOR_PAD_CLASS(klass) \
+        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COMPOSITOR_PAD, GstCompositorPadClass))
+#define GST_IS_COMPOSITOR_PAD(obj) \
+        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COMPOSITOR_PAD))
+#define GST_IS_COMPOSITOR_PAD_CLASS(klass) \
+        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COMPOSITOR_PAD))
+
 typedef struct _GstCompositor GstCompositor;
 typedef struct _GstCompositorClass GstCompositorClass;
 
+typedef struct _GstCompositorPad GstCompositorPad;
+typedef struct _GstCompositorPadClass GstCompositorPadClass;
+
 /**
  * GstcompositorBackground:
  * @COMPOSITOR_BACKGROUND_CHECKER: checker pattern background
@@ -79,7 +92,31 @@ struct _GstCompositorClass
   GstVideoAggregatorClass parent_class;
 };
 
+/**
+ * GstCompositorPad:
+ *
+ * The opaque #GstCompositorPad structure.
+ */
+struct _GstCompositorPad
+{
+  GstVideoAggregatorConvertPad parent;
+
+  /* properties */
+  gint xpos, ypos;
+  gint width, height;
+  gdouble alpha;
+  gdouble crossfade;
+
+  gboolean crossfaded;
+};
+
+struct _GstCompositorPadClass
+{
+  GstVideoAggregatorConvertPadClass parent_class;
+};
+
 GType gst_compositor_get_type (void);
+GType gst_compositor_pad_get_type (void);
 
 G_END_DECLS
 #endif /* __GST_COMPOSITOR_H__ */
diff --git a/gst/compositor/compositorpad.h b/gst/compositor/compositorpad.h
deleted file mode 100644
index 88be0e2..0000000
--- a/gst/compositor/compositorpad.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Generic compositor plugin pad
- * Copyright (C) 2008 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_COMPOSITOR_PAD_H__
-#define __GST_COMPOSITOR_PAD_H__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COMPOSITOR_PAD (gst_compositor_pad_get_type())
-#define GST_COMPOSITOR_PAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COMPOSITOR_PAD, GstCompositorPad))
-#define GST_COMPOSITOR_PAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COMPOSITOR_PAD, GstCompositorPadClass))
-#define GST_IS_COMPOSITOR_PAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COMPOSITOR_PAD))
-#define GST_IS_COMPOSITOR_PAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COMPOSITOR_PAD))
-
-typedef struct _GstCompositorPad GstCompositorPad;
-typedef struct _GstCompositorPadClass GstCompositorPadClass;
-
-/**
- * GstCompositorPad:
- *
- * The opaque #GstCompositorPad structure.
- */
-struct _GstCompositorPad
-{
-  GstVideoAggregatorConvertPad parent;
-
-  /* properties */
-  gint xpos, ypos;
-  gint width, height;
-  gdouble alpha;
-  gdouble crossfade;
-
-  gboolean crossfaded;
-};
-
-struct _GstCompositorPadClass
-{
-  GstVideoAggregatorConvertPadClass parent_class;
-};
-
-GType gst_compositor_pad_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_COMPOSITOR_PAD_H__ */
-- 
2.7.4