diff options
| author | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2009-05-20 15:06:25 +0300 |
|---|---|---|
| committer | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2009-05-22 00:55:08 +0300 |
| commit | cd0e75ac1aa65975fa4de03f1af796c99d2d71b7 (patch) | |
| tree | 542d6e13302f5842df178563d91f829cc75a6d7a /ext/soup | |
| parent | a0de8567ca8a309a5d98c090e3fd86ab73a7252e (diff) | |
souphttpsrc: Rename icy_caps to src_caps
Diffstat (limited to 'ext/soup')
| -rw-r--r-- | ext/soup/gstsouphttpsrc.c | 18 | ||||
| -rw-r--r-- | ext/soup/gstsouphttpsrc.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index f067a848..12cd8fb1 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -342,7 +342,7 @@ gst_soup_http_src_init (GstSoupHTTPSrc * src, GstSoupHTTPSrcClass * g_class) src->proxy_id = NULL; src->proxy_pw = NULL; src->cookies = NULL; - src->icy_caps = NULL; + src->src_caps = NULL; src->iradio_mode = FALSE; src->iradio_name = NULL; src->iradio_genre = NULL; @@ -397,9 +397,9 @@ gst_soup_http_src_dispose (GObject * gobject) src->iradio_url = NULL; g_free (src->iradio_title); src->iradio_title = NULL; - if (src->icy_caps) { - gst_caps_unref (src->icy_caps); - src->icy_caps = NULL; + if (src->src_caps) { + gst_caps_unref (src->src_caps); + src->src_caps = NULL; } G_OBJECT_CLASS (parent_class)->dispose (gobject); @@ -786,10 +786,10 @@ gst_soup_http_src_got_headers_cb (SoupMessage * msg, GstSoupHTTPSrc * src) GST_DEBUG_OBJECT (src, "icy-metaint: %s (parsed: %d)", value, icy_metaint); if (icy_metaint > 0) { - if (src->icy_caps) - gst_caps_unref (src->icy_caps); + if (src->src_caps) + gst_caps_unref (src->src_caps); - src->icy_caps = gst_caps_new_simple ("application/x-icy", + src->src_caps = gst_caps_new_simple ("application/x-icy", "metadata-interval", G_TYPE_INT, icy_metaint, NULL); } } @@ -953,7 +953,7 @@ gst_soup_http_src_chunk_allocator (SoupMessage * msg, gsize max_len, rc = gst_pad_alloc_buffer (GST_BASE_SRC_PAD (basesrc), GST_BUFFER_OFFSET_NONE, length, - src->icy_caps ? src->icy_caps : + src->src_caps ? src->src_caps : GST_PAD_CAPS (GST_BASE_SRC_PAD (basesrc)), &gstbuf); if (G_UNLIKELY (rc != GST_FLOW_OK)) { /* Failed to allocate buffer. Stall SoupSession and return error code @@ -997,7 +997,7 @@ gst_soup_http_src_got_chunk_cb (SoupMessage * msg, SoupBuffer * chunk, GST_BUFFER_OFFSET (*src->outbuf) = basesrc->segment.last_stop; gst_buffer_set_caps (*src->outbuf, - (src->icy_caps) ? src->icy_caps : + (src->src_caps) ? src->src_caps : GST_PAD_CAPS (GST_BASE_SRC_PAD (basesrc))); new_position = src->read_position + chunk->length; diff --git a/ext/soup/gstsouphttpsrc.h b/ext/soup/gstsouphttpsrc.h index ffe6eec6..1427e1c2 100644 --- a/ext/soup/gstsouphttpsrc.h +++ b/ext/soup/gstsouphttpsrc.h @@ -78,7 +78,7 @@ struct _GstSoupHTTPSrc { /* Shoutcast/icecast metadata extraction handling. */ gboolean iradio_mode; - GstCaps *icy_caps; + GstCaps *src_caps; gchar *iradio_name; gchar *iradio_genre; gchar *iradio_url; |