Revert "rtspconnection: don't use GLib-2.16 API, we require only 2.14"

This reverts commit 418760cf74.

We now require GLib 2.16.
This commit is contained in:
Tim-Philipp Müller 2009-05-26 11:13:35 +01:00
parent b39ea34a6d
commit 6292ff4ae0

View file

@ -2808,12 +2808,9 @@ static void
gst_rtsp_source_finalize (GSource * source) gst_rtsp_source_finalize (GSource * source)
{ {
GstRTSPWatch *watch = (GstRTSPWatch *) source; GstRTSPWatch *watch = (GstRTSPWatch *) source;
gpointer rtsp_rec;
build_reset (&watch->builder); build_reset (&watch->builder);
while ((rtsp_rec = g_async_queue_try_pop (watch->messages)))
gst_rtsp_rec_free (rtsp_rec);
g_async_queue_unref (watch->messages); g_async_queue_unref (watch->messages);
watch->messages = NULL; watch->messages = NULL;
@ -2865,8 +2862,7 @@ gst_rtsp_watch_new (GstRTSPConnection * conn,
result->conn = conn; result->conn = conn;
result->builder.state = STATE_START; result->builder.state = STATE_START;
/* FIXME: use g_async_queue_new_full() once we depend on GLib >= 2.16 */ result->messages = g_async_queue_new_full (gst_rtsp_rec_free);
result->messages = g_async_queue_new ();
result->readfd.fd = -1; result->readfd.fd = -1;
result->writefd.fd = -1; result->writefd.fd = -1;