From 7532de687a9b53062d727595f6738b04bdfac1e2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 12 Jul 2013 15:13:48 +0200 Subject: [PATCH] client: allow for sending any message, not only requests Change the _send_request() method to _send_message() so that we can both send requests and replies. --- gst/rtsp-server/rtsp-client.c | 22 +++++++++++----------- gst/rtsp-server/rtsp-client.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index e451d0a..529d7cc 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -2521,24 +2521,24 @@ gst_rtsp_client_handle_message (GstRTSPClient * client, } /** - * gst_rtsp_client_send_request: + * gst_rtsp_client_send_message: * @client: a #GstRTSPClient - * @session: a #GstRTSPSession to send the request to or %NULL - * @request: The request #GstRTSPMessage to send + * @session: a #GstRTSPSession to send the message to or %NULL + * @message: The #GstRTSPMessage to send * - * Send a request message to the remote end. @request must be a - * #GST_RTSP_MESSAGE_REQUEST. + * Send a message message to the remote end. @message must be a + * #GST_RTSP_MESSAGE_REQUEST or a #GST_RTSP_MESSAGE_RESPONSE. */ GstRTSPResult -gst_rtsp_client_send_request (GstRTSPClient * client, GstRTSPSession * session, - GstRTSPMessage * request) +gst_rtsp_client_send_message (GstRTSPClient * client, GstRTSPSession * session, + GstRTSPMessage * message) { g_return_val_if_fail (GST_IS_RTSP_CLIENT (client), GST_RTSP_EINVAL); - g_return_val_if_fail (request != NULL, GST_RTSP_EINVAL); - g_return_val_if_fail (request->type == GST_RTSP_MESSAGE_REQUEST, - GST_RTSP_EINVAL); + g_return_val_if_fail (message != NULL, GST_RTSP_EINVAL); + g_return_val_if_fail (message->type == GST_RTSP_MESSAGE_REQUEST || + message->type == GST_RTSP_MESSAGE_RESPONSE, GST_RTSP_EINVAL); - send_message (client, session, request, FALSE); + send_message (client, session, message, FALSE); return GST_RTSP_OK; } diff --git a/gst/rtsp-server/rtsp-client.h b/gst/rtsp-server/rtsp-client.h index d624638..af1ef2c 100644 --- a/gst/rtsp-server/rtsp-client.h +++ b/gst/rtsp-server/rtsp-client.h @@ -188,9 +188,9 @@ void gst_rtsp_client_set_send_func (GstRTSPClient *client, GstRTSPResult gst_rtsp_client_handle_message (GstRTSPClient *client, GstRTSPMessage *message); -GstRTSPResult gst_rtsp_client_send_request (GstRTSPClient * client, +GstRTSPResult gst_rtsp_client_send_message (GstRTSPClient * client, GstRTSPSession *session, - GstRTSPMessage *request); + GstRTSPMessage *message); /** * GstRTSPClientSessionFilterFunc: * @client: a #GstRTSPClient object -- 2.7.4