From e67a1c664c4d9d6e6c1dad2ceb7d9a9a27b41bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 13 Feb 2012 11:06:33 +0000 Subject: [PATCH] rtsp-client: update for new map API --- gst/rtsp-server/rtsp-client.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 393884e546..6f17918054 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -400,22 +400,23 @@ static gboolean do_send_data (GstBuffer * buffer, guint8 channel, GstRTSPClient * client) { GstRTSPMessage message = { 0 }; + GstMapInfo map_info; guint8 *data; guint usize; - gsize size; gst_rtsp_message_init_data (&message, channel); - data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ); - usize = size; - gst_rtsp_message_take_body (&message, data, usize); + if (!gst_buffer_map (buffer, &map_info, GST_MAP_READ)) + return FALSE; + + gst_rtsp_message_take_body (&message, map_info.data, map_info.size); /* FIXME, client->watch could have been finalized here, we need to keep an * extra refcount to the watch. */ gst_rtsp_watch_send_message (client->watch, &message, NULL); gst_rtsp_message_steal_body (&message, &data, &usize); - gst_buffer_unmap (buffer, data, size); + gst_buffer_unmap (buffer, &map_info); gst_rtsp_message_unset (&message);