From a1ced2746d972aa541d906238102987f7d6a7798 Mon Sep 17 00:00:00 2001 From: Wouter Cloetens Date: Tue, 11 Dec 2007 16:39:39 +0000 Subject: ext/soup/gstsouphttpsrc.*: Do not try to unpause I/O in the "queued" state. Original commit message from CVS: Patch by: Wouter Cloetens * ext/soup/gstsouphttpsrc.c: (_do_init), (gst_souphttp_src_class_init), (gst_souphttp_src_init), (gst_souphttp_src_dispose), (gst_souphttp_src_set_property), (gst_souphttp_src_get_property), (unicodify), (gst_souphttp_src_unicodify), (gst_souphttp_src_create), (gst_souphttp_src_start), (gst_souphttp_src_stop), (gst_souphttp_src_unlock), (gst_souphttp_src_unlock_stop), (gst_souphttp_src_get_size), (gst_souphttp_src_is_seekable), (soup_got_headers), (soup_got_body), (soup_finished), (soup_got_chunk), (soup_response), (soup_parse_status), (gst_souphttp_src_uri_get_type), (gst_souphttp_src_uri_get_protocols), (gst_souphttp_src_uri_get_uri), (gst_souphttp_src_uri_set_uri), (gst_souphttp_src_uri_handler_init): * ext/soup/gstsouphttpsrc.h: Do not try to unpause I/O in the "queued" state. Reorganise a bunch of things and cleanups. Uses G_GUINT64_FORMAT instead of hard-coding %llu. See #502335. --- ext/soup/gstsouphttpsrc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'ext/soup/gstsouphttpsrc.h') diff --git a/ext/soup/gstsouphttpsrc.h b/ext/soup/gstsouphttpsrc.h index 5dca307c..6ed913e3 100644 --- a/ext/soup/gstsouphttpsrc.h +++ b/ext/soup/gstsouphttpsrc.h @@ -41,6 +41,7 @@ struct _GstSouphttpSrc { GstPushSrc element; gchar * location; /* Full URI. */ + gchar * user_agent; /* User-Agent HTTP header. */ GMainContext * context; /* I/O context. */ GMainLoop * loop; /* Event loop. */ SoupSession * session; /* Async context. */ @@ -48,8 +49,18 @@ struct _GstSouphttpSrc { GstFlowReturn ret; /* Return code from callback. */ GstBuffer ** outbuf; /* Return buffer allocated by callback. */ gboolean interrupted; /* Signal unlock(). */ + gboolean have_size; /* Received and parsed Content-Length header. */ guint64 content_size; /* Value of Content-Length header. */ + guint64 read_position; /* Current position. */ + + /* Shoutcast/icecast metadata extraction handling. */ + gboolean iradio_mode; + GstCaps * icy_caps; + gchar * iradio_name; + gchar * iradio_genre; + gchar * iradio_url; + gchar * iradio_title; }; struct _GstSouphttpSrcClass { -- cgit v1.2.1