From e756324490490761e4027639caaa6589ab335b1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20P=C3=B6lsterl?= Date: Sat, 12 Oct 2013 23:56:00 +0200 Subject: [PATCH] Fixed several GIR warnings --- gst/rtsp-server/Makefile.am | 4 ++++ gst/rtsp-server/rtsp-auth.c | 4 ++-- gst/rtsp-server/rtsp-context.c | 2 +- gst/rtsp-server/rtsp-media.c | 9 +++++---- gst/rtsp-server/rtsp-mount-points.c | 2 +- gst/rtsp-server/rtsp-server.h | 2 +- gst/rtsp-server/rtsp-session-media.c | 2 +- gst/rtsp-server/rtsp-session.c | 2 +- gst/rtsp-server/rtsp-stream.c | 6 +++--- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am index 638b2c6..7697ae8 100644 --- a/gst/rtsp-server/Makefile.am +++ b/gst/rtsp-server/Makefile.am @@ -82,12 +82,15 @@ GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@ --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@` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-net-@GST_API_VERSION@` \ --library=libgstrtspserver-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstRtsp-@GST_API_VERSION@ \ + --include=GstNet-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-rtsp-@GST_API_VERSION@ \ + --pkg gstreamer-net-@GST_API_VERSION@ \ --pkg-export gstreamer-rtsp-server-@GST_API_VERSION@ \ --output $@ \ $(gir_headers) \ @@ -110,6 +113,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-@GST_API_VERSION@` \ --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-@GST_API_VERSION@` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-net-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c index 8154bab..694d216 100644 --- a/gst/rtsp-server/rtsp-auth.c +++ b/gst/rtsp-server/rtsp-auth.c @@ -176,7 +176,7 @@ gst_rtsp_auth_new (void) /** * gst_rtsp_auth_set_tls_certificate: * @auth: a #GstRTSPAuth - * @cert: (allow none): a #GTlsCertificate + * @cert: (allow-none): a #GTlsCertificate * * Set the TLS certificate for the auth. Client connections will only * be accepted when TLS is negotiated. @@ -233,7 +233,7 @@ gst_rtsp_auth_get_tls_certificate (GstRTSPAuth * auth) /** * gst_rtsp_auth_set_default_token: * @auth: a #GstRTSPAuth - * @token: (allow none): a #GstRTSPToken + * @token: (allow-none): a #GstRTSPToken * * Set the default #GstRTSPToken to @token in @auth. The default token will * be used for unauthenticated users. diff --git a/gst/rtsp-server/rtsp-context.c b/gst/rtsp-server/rtsp-context.c index 3b8c0a1..817207d 100644 --- a/gst/rtsp-server/rtsp-context.c +++ b/gst/rtsp-server/rtsp-context.c @@ -29,7 +29,7 @@ static GPrivate current_context; /** - * gst_rtsp_context_get_current: + * gst_rtsp_context_get_current: (skip) * * Get the current #GstRTSPContext. This object is retrieved from the * current thread that is handling the request for a client. diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index 2fcbf32..e26a588 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -483,7 +483,7 @@ gst_rtsp_media_new (GstElement * element) * * Get the element that was used when constructing @media. * - * Returns: a #GstElement. Unref after usage. + * Returns: (transfer full): a #GstElement. Unref after usage. */ GstElement * gst_rtsp_media_get_element (GstRTSPMedia * media) @@ -2000,7 +2000,7 @@ get_clock_unlocked (GstRTSPMedia * media) * * @media must be prepared before this method returns a valid clock object. * - * Returns: the #GstClock used by @media. unref after usage. + * Returns: (transfer full): the #GstClock used by @media. unref after usage. */ GstClock * gst_rtsp_media_get_clock (GstRTSPMedia * media) @@ -2066,7 +2066,7 @@ not_prepared: * Get the #GstNetTimeProvider for the clock used by @media. The time provider * will listen on @address and @port for client time requests. * - * Returns: the #GstNetTimeProvider of @media. + * Returns: (transfer full): the #GstNetTimeProvider of @media. */ GstNetTimeProvider * gst_rtsp_media_get_time_provider (GstRTSPMedia * media, const gchar * address, @@ -2131,7 +2131,8 @@ gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media, GstState state) * gst_rtsp_media_set_state: * @media: a #GstRTSPMedia * @state: the target state of the media - * @transports: a #GPtrArray of #GstRTSPStreamTransport pointers + * @transports: (element-type GstRtspServer.RTSPStreamTransport): a #GPtrArray + * of #GstRTSPStreamTransport pointers * * Set the state of @media to @state and for the transports in @transports. * diff --git a/gst/rtsp-server/rtsp-mount-points.c b/gst/rtsp-server/rtsp-mount-points.c index de23bc1..b89f2c4 100644 --- a/gst/rtsp-server/rtsp-mount-points.c +++ b/gst/rtsp-server/rtsp-mount-points.c @@ -221,7 +221,7 @@ has_prefix (DataItem * str, DataItem * prefix) * gst_rtsp_mount_points_match: * @mounts: a #GstRTSPMountPoints * @path: a mount point - * @matched: the amount of @path matched + * @matched: (out): the amount of @path matched * * Find the factory in @mounts that has the longest match with @path. * diff --git a/gst/rtsp-server/rtsp-server.h b/gst/rtsp-server/rtsp-server.h index 84aa178..610c9a0 100644 --- a/gst/rtsp-server/rtsp-server.h +++ b/gst/rtsp-server/rtsp-server.h @@ -119,7 +119,7 @@ guint gst_rtsp_server_attach (GstRTSPServer *serve /** * GstRTSPServerClientFilterFunc: * @server: a #GstRTSPServer object - * @sess: a #GstRTSPClient in @server + * @client: a #GstRTSPClient in @server * @user_data: user data that has been given to gst_rtsp_server_client_filter() * * This function will be called by the gst_rtsp_server_client_filter(). An diff --git a/gst/rtsp-server/rtsp-session-media.c b/gst/rtsp-server/rtsp-session-media.c index 1b8e7e2..6c0a0f5 100644 --- a/gst/rtsp-server/rtsp-session-media.c +++ b/gst/rtsp-server/rtsp-session-media.c @@ -163,7 +163,7 @@ gst_rtsp_session_media_new (const gchar * path, GstRTSPMedia * media) * gst_rtsp_session_media_matches: * @media: a #GstRTSPSessionMedia * @path: a path - * @matched: the amount of matched characters of @path + * @matched: (out): the amount of matched characters of @path * * Check if the path of @media matches @path. It @path matches, the amount of * matched characters is returned in @matched. diff --git a/gst/rtsp-server/rtsp-session.c b/gst/rtsp-server/rtsp-session.c index 20540ab..85b702c 100644 --- a/gst/rtsp-server/rtsp-session.c +++ b/gst/rtsp-server/rtsp-session.c @@ -264,7 +264,7 @@ gst_rtsp_session_release_media (GstRTSPSession * sess, * gst_rtsp_session_get_media: * @sess: a #GstRTSPSession * @path: the path for the media - * @matched: the amount of matched characters + * @matched: (out): the amount of matched characters * * Get the session media for @path. @matched will contain the number of matched * characters of @path. diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index 91512be..c4b643c 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -312,7 +312,7 @@ gst_rtsp_stream_get_index (GstRTSPStream * stream) * * Get the srcpad associated with @stream. * - * Return: the srcpad. Unref after usage. + * Returns: (transfer full): the srcpad. Unref after usage. */ GstPad * gst_rtsp_stream_get_srcpad (GstRTSPStream * stream) @@ -328,7 +328,7 @@ gst_rtsp_stream_get_srcpad (GstRTSPStream * stream) * * Get the control string to identify this stream. * - * Return: the control string. free after usage. + * Returns: (transfer full): the control string. free after usage. */ gchar * gst_rtsp_stream_get_control (GstRTSPStream * stream) @@ -1076,7 +1076,7 @@ gst_rtsp_stream_get_server_port (GstRTSPStream * stream, * * Get the RTP session of this stream. * - * Returns: The RTP session of this stream. Unref after usage. + * Returns: (transfer full): The RTP session of this stream. Unref after usage. */ GObject * gst_rtsp_stream_get_rtpsession (GstRTSPStream * stream) -- 2.7.4