mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

compositor: Remove extra header for the pad declaration

Browse source 
There's no reason for having this separate apart from making things less
discoverable.
This commit is contained in:
Sebastian Dröge 2018-10-27 12:37:07 +01:00
parent 2f7d87a7d1
commit 690a18ee09
4 changed files with 38 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/compositor/Makefile.am
View file

@ -25,5 +25,4 @@ libgstcompositor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
# headers we need but don't want installed # headers we need but don't want installed
noinst_HEADERS = \ noinst_HEADERS = \
blend.h \ blend.h \
compositor.h \ compositor.h
compositorpad.h

1
gst/compositor/compositor.c
View file

@ -93,7 +93,6 @@
#include <string.h> #include <string.h>
#include "compositor.h" #include "compositor.h"
#include "compositorpad.h"
#ifdef DISABLE_ORC #ifdef DISABLE_ORC
#define orc_memset memset #define orc_memset memset

37
gst/compositor/compositor.h
View file

@ -39,9 +39,22 @@ G_BEGIN_DECLS
#define GST_IS_COMPOSITOR_CLASS(klass) \ #define GST_IS_COMPOSITOR_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COMPOSITOR)) (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 _GstCompositor GstCompositor;
typedef struct _GstCompositorClass GstCompositorClass; typedef struct _GstCompositorClass GstCompositorClass;
typedef struct _GstCompositorPad GstCompositorPad;
typedef struct _GstCompositorPadClass GstCompositorPadClass;
/** /**
* GstcompositorBackground: * GstcompositorBackground:
* @COMPOSITOR_BACKGROUND_CHECKER: checker pattern background * @COMPOSITOR_BACKGROUND_CHECKER: checker pattern background
@ -79,7 +92,31 @@ struct _GstCompositorClass
GstVideoAggregatorClass parent_class; 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_get_type (void);
GType gst_compositor_pad_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_COMPOSITOR_H__ */ #endif /* __GST_COMPOSITOR_H__ */

68
gst/compositor/compositorpad.h
View file

@ -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__ */