mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-23 17:14:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

[307/906] Remove conditionals on gdkpixbuf

Browse source
This commit is contained in:
David Schleef 2009-02-04 16:57:14 -08:00 committed by Matthew Waters
parent 4d4e3ad4f9
commit 72691ce147
3 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/gl/Makefile.am
View file

@ -10,6 +10,8 @@ libgstopengl_la_SOURCES = \
gstglimagesink.h \ gstglimagesink.h \
gstglupload.c \ gstglupload.c \
gstglupload.h \ gstglupload.h \
gstglbumper.c \
gstglbumber.h \
gstgldownload.c \ gstgldownload.c \
gstgldownload.h \ gstgldownload.h \
gstglfilterblur.c \ gstglfilterblur.c \
@ -24,6 +26,8 @@ libgstopengl_la_SOURCES = \
gstglfilterapp.h \ gstglfilterapp.h \
gstglcolorscale.c \ gstglcolorscale.c \
gstglcolorscale.h \ gstglcolorscale.h \
gstgldifferencematte.c \
gstglpixbufoverlay.c \
gltestsrc.c \ gltestsrc.c \
gltestsrc.h \ gltestsrc.h \
gstgltestsrc.c \ gstgltestsrc.c \
@ -49,13 +53,6 @@ libgstopengl_la_SOURCES = \
effects/gstgleffectglow.c \ effects/gstgleffectglow.c \
effects/gstgleffectxray.c effects/gstgleffectxray.c
if HAVE_GDKPIXBUF
libgstopengl_la_SOURCES += gstglpixbufoverlay.c \
gstgldifferencematte.c \
gstglbumper.c \
gstglbumber.h
endif
# check order of CFLAGS and LIBS, shouldn't the order be the other way around # check order of CFLAGS and LIBS, shouldn't the order be the other way around
# (like in AM_CFLAGS)? # (like in AM_CFLAGS)?
libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
@ -63,9 +60,6 @@ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
-I$(top_srcdir)/gst-libs/gst/gl \ -I$(top_srcdir)/gst-libs/gst/gl \
-I$(top_srcdir)/gst/gl/effects -I$(top_srcdir)/gst/gl/effects
if HAVE_GDKPIXBUF
libgstopengl_la_CFLAGS += $(GDKPIXBUF_CFLAGS)
endif
libgstopengl_la_LIBADD = \ libgstopengl_la_LIBADD = \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \
@ -73,9 +67,6 @@ libgstopengl_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
$(GL_LIBS) \ $(GL_LIBS) \
$(LIBPNG_LIBS) $(LIBPNG_LIBS)
if HAVE_GDKPIXBUF
libgstopengl_la_LIBADD += $(GDKPIXBUF_LIBS)
endif
libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

4
gst/gl/gstglpixbufoverlay.c
View file

@ -21,7 +21,7 @@
/** /**
* SECTION:element-glpixbufoverlay * SECTION:element-glpixbufoverlay
* *
* Overlay GL video texture with a gdkpixbuf. * Overlay GL video texture with a PNG image
* *
* <refsect2> * <refsect2>
* <title>Examples</title> * <title>Examples</title>
@ -94,7 +94,7 @@ static gboolean gst_gl_pixbufoverlay_loader (GstGLFilter* filter);
static const GstElementDetails element_details = GST_ELEMENT_DETAILS ( static const GstElementDetails element_details = GST_ELEMENT_DETAILS (
"Gstreamer OpenGL PixbufOverlay", "Gstreamer OpenGL PixbufOverlay",
"Filter/Effect", "Filter/Effect",
"Overlay GL video texture with a gdkpixbuf", "Overlay GL video texture with a PNG image",
"Filippo Argiolas <filippo.argiolas@gmail.com>"); "Filippo Argiolas <filippo.argiolas@gmail.com>");
enum enum

8
gst/gl/gstopengl.c
View file

@ -53,9 +53,7 @@
#include "gstglimagesink.h" #include "gstglimagesink.h"
#include "gstglcolorscale.h" #include "gstglcolorscale.h"
#include "gstgleffects.h" #include "gstgleffects.h"
#ifdef HAVE_LIBPNG
#include "gstglbumper.h" #include "gstglbumper.h"
#endif
GType gst_gl_effects_get_type (void); GType gst_gl_effects_get_type (void);
GType gst_gl_filter_app_get_type (void); GType gst_gl_filter_app_get_type (void);
@ -65,11 +63,9 @@ GType gst_gl_filtersobel_get_type (void);
GType gst_gl_filter_edge_get_type (void); GType gst_gl_filter_edge_get_type (void);
GType gst_gl_filter_laplacian_get_type (void); GType gst_gl_filter_laplacian_get_type (void);
GType gst_gl_filter_glass_get_type (void); GType gst_gl_filter_glass_get_type (void);
#ifdef HAVE_LIBPNG
GType gst_gl_pixbufoverlay_get_type (void); GType gst_gl_pixbufoverlay_get_type (void);
GType gst_gl_differencematte_get_type (void); GType gst_gl_differencematte_get_type (void);
GType gst_gl_bumper_get_type (void); GType gst_gl_bumper_get_type (void);
#endif
#define GST_CAT_DEFAULT gst_gl_gstgl_debug #define GST_CAT_DEFAULT gst_gl_gstgl_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@ -94,8 +90,7 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_FILTER_CUBE)) { GST_RANK_NONE, GST_TYPE_GL_FILTER_CUBE)) {
return FALSE; return FALSE;
} }
#ifdef HAVE_LIBPNG if (!gst_element_register (plugin, "gloverlay",
if (!gst_element_register (plugin, "glpixbufoverlay",
GST_RANK_NONE, gst_gl_pixbufoverlay_get_type())) { GST_RANK_NONE, gst_gl_pixbufoverlay_get_type())) {
return FALSE; return FALSE;
} }
@ -107,7 +102,6 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, gst_gl_bumper_get_type())) { GST_RANK_NONE, gst_gl_bumper_get_type())) {
return FALSE; return FALSE;
} }
#endif
if (!gst_element_register (plugin, "gleffects", if (!gst_element_register (plugin, "gleffects",
GST_RANK_NONE, gst_gl_effects_get_type())) { GST_RANK_NONE, gst_gl_effects_get_type())) {