diff options
| author | Evan Nemerson <evan@nemerson.com> | 2014-06-30 00:37:59 -0700 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-06-30 09:45:11 +0200 |
| commit | 41d1ef7ed3df2471bea4894b6106020a74084f19 (patch) | |
| tree | 7bca5ef1b315127f81a9c3a0a167a778dd88086b | |
| parent | b6f4dd4c28a5d32feaef67a74029bb13579a76b3 (diff) | |
Make rtsp-server.h a single-include header, use it for G-I
https://bugzilla.gnome.org/show_bug.cgi?id=732411
| -rw-r--r-- | gst/rtsp-server/Makefile.am | 3 | ||||
| -rw-r--r-- | gst/rtsp-server/rtsp-server.h | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am index bbae027..4fcd366 100644 --- a/gst/rtsp-server/Makefile.am +++ b/gst/rtsp-server/Makefile.am @@ -68,7 +68,6 @@ BUILT_GIRSOURCES = GstRtspServer-@GST_API_VERSION@.gir gir_headers=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@include_HEADERS)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstrtspserver_@GST_API_VERSION@_la_SOURCES)) -gir_cincludes=$(patsubst %,--c-include='gst/rtsp-server/%',$(libgstrtspinclude_HEADERS)) GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@GST_API_VERSION@.la $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ @@ -79,7 +78,7 @@ GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@ -I$(top_srcdir) \ -I$(top_builddir) \ -DIN_GOBJECT_INTROSPECTION=1 \ - --c-include='gst/gst.h' \ + --c-include='gst/rtsp-server/rtsp-server.h' \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \ diff --git a/gst/rtsp-server/rtsp-server.h b/gst/rtsp-server/rtsp-server.h index afe145a..9a6f9d4 100644 --- a/gst/rtsp-server/rtsp-server.h +++ b/gst/rtsp-server/rtsp-server.h @@ -29,9 +29,24 @@ typedef struct _GstRTSPServerClass GstRTSPServerClass; typedef struct _GstRTSPServerPrivate GstRTSPServerPrivate; #include "rtsp-session-pool.h" -#include "rtsp-mount-points.h" +#include "rtsp-session.h" +#include "rtsp-media.h" +#include "rtsp-stream.h" +#include "rtsp-stream-transport.h" +#include "rtsp-address-pool.h" +#include "rtsp-thread-pool.h" #include "rtsp-client.h" +#include "rtsp-context.h" +#include "rtsp-server.h" +#include "rtsp-mount-points.h" +#include "rtsp-media-factory.h" +#include "rtsp-permissions.h" #include "rtsp-auth.h" +#include "rtsp-token.h" +#include "rtsp-session-media.h" +#include "rtsp-sdp.h" +#include "rtsp-media-factory-uri.h" +#include "rtsp-params.h" #define GST_TYPE_RTSP_SERVER (gst_rtsp_server_get_type ()) #define GST_IS_RTSP_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_RTSP_SERVER)) |