mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 17:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/: Make things work with --disable-parse as they do with

Browse source 
Original commit message from CVS:
* gst/Makefile.am:
* gst/gstparse.h:
* gst/gstutils.c:
* gst/gstutils.h:
Make things work with --disable-parse as they do with
--disable-load-save - the symbols involved disappear, but the
header is still installed and GST_DISABLE_PARSE is included via
gstconfig.h
This commit is contained in:
Jan Schmidt 2006-02-20 23:34:40 +00:00
parent 4bcfb92b9a
commit e2cca3d699
5 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2006-02-21 Jan Schmidt <thaytan@mad.scientist.com>
* gst/Makefile.am:
* gst/gstparse.h:
* gst/gstutils.c:
* gst/gstutils.h:
Make things work with --disable-parse as they do with
--disable-load-save - the symbols involved disappear, but the
header is still installed and GST_DISABLE_PARSE is included via
gstconfig.h
2006-02-20 Julien MOUTTE <julien@moutte.net> 2006-02-20 Julien MOUTTE <julien@moutte.net>
* libs/gst/base/gstbasetransform.c: * libs/gst/base/gstbasetransform.c:

4
gst/Makefile.am
View file

@ -14,12 +14,10 @@ endif
if GST_DISABLE_PARSE if GST_DISABLE_PARSE
GST_PARSE_SRC = GST_PARSE_SRC =
GST_PARSE_H =
SUBDIRS_PARSE = SUBDIRS_PARSE =
GST_PARSE_LA = GST_PARSE_LA =
else else
GST_PARSE_SRC = gstparse.c GST_PARSE_SRC = gstparse.c
GST_PARSE_H = gstparse.h
SUBDIRS_PARSE = parse SUBDIRS_PARSE = parse
GST_PARSE_LA = parse/libgstparse.la GST_PARSE_LA = parse/libgstparse.la
endif endif
@ -190,7 +188,7 @@ gst_headers = \
gstutils.h \ gstutils.h \
gstvalue.h \ gstvalue.h \
gstregistry.h \ gstregistry.h \
$(GST_PARSE_H) \ gstparse.h \
gstxml.h gstxml.h
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)

2
gst/gstparse.h
View file

@ -23,6 +23,8 @@
#ifndef __GST_PARSE_H__ #ifndef __GST_PARSE_H__
#define __GST_PARSE_H__ #define __GST_PARSE_H__
#include <gst/gstconfig.h>
#include <gst/gstelement.h> #include <gst/gstelement.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gst/gstutils.c
View file

@ -3047,6 +3047,7 @@ gst_bin_find_unconnected_pad (GstBin * bin, GstPadDirection direction)
return pad; return pad;
} }
#ifndef GST_DISABLE_PARSE
/** /**
* gst_parse_bin_from_description: * gst_parse_bin_from_description:
* @bin_description: command line describing the bin * @bin_description: command line describing the bin
@ -3107,3 +3108,4 @@ gst_parse_bin_from_description (const gchar * bin_description,
return GST_ELEMENT (bin); return GST_ELEMENT (bin);
} }
#endif

10
gst/gstutils.h
View file

@ -25,6 +25,8 @@
#ifndef __GST_UTILS_H__ #ifndef __GST_UTILS_H__
#define __GST_UTILS_H__ #define __GST_UTILS_H__
#include <gst/gstconfig.h>
#include <glib.h> #include <glib.h>
#include <gst/gstbin.h> #include <gst/gstbin.h>
@ -599,10 +601,18 @@ void gst_element_found_tags_for_pad (GstElement * element,
void gst_element_found_tags (GstElement * element, void gst_element_found_tags (GstElement * element,
GstTagList * list); GstTagList * list);
#ifndef GST_DISABLE_PARSE
/* parse utility functions */ /* parse utility functions */
GstElement * gst_parse_bin_from_description (const gchar * bin_description, GstElement * gst_parse_bin_from_description (const gchar * bin_description,
gboolean ghost_unconnected_pads, gboolean ghost_unconnected_pads,
GError ** err); GError ** err);
#else /* GST_DISABLE_PARSE */
#if defined _GNUC_ && _GNUC_ >= 3
#pragma GCC poison gst_parse_bin_from_description
#endif
#endif
G_END_DECLS G_END_DECLS