mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 13:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

souphttpsrc: Rename icy_caps to src_caps

Browse source
This commit is contained in:
Zeeshan Ali (Khattak) 2009-05-20 15:06:25 +03:00
parent a0de8567ca
commit cd0e75ac1a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/soup/gstsouphttpsrc.c
View file

@ -342,7 +342,7 @@ gst_soup_http_src_init (GstSoupHTTPSrc * src, GstSoupHTTPSrcClass * g_class)
src->proxy_id = NULL; src->proxy_id = NULL;
src->proxy_pw = NULL; src->proxy_pw = NULL;
src->cookies = NULL; src->cookies = NULL;
src->icy_caps = NULL; src->src_caps = NULL;
src->iradio_mode = FALSE; src->iradio_mode = FALSE;
src->iradio_name = NULL; src->iradio_name = NULL;
src->iradio_genre = NULL; src->iradio_genre = NULL;
@ -397,9 +397,9 @@ gst_soup_http_src_dispose (GObject * gobject)
src->iradio_url = NULL; src->iradio_url = NULL;
g_free (src->iradio_title); g_free (src->iradio_title);
src->iradio_title = NULL; src->iradio_title = NULL;
if (src->icy_caps) { if (src->src_caps) {
gst_caps_unref (src->icy_caps); gst_caps_unref (src->src_caps);
src->icy_caps = NULL; src->src_caps = NULL;
} }
G_OBJECT_CLASS (parent_class)->dispose (gobject); 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); GST_DEBUG_OBJECT (src, "icy-metaint: %s (parsed: %d)", value, icy_metaint);
if (icy_metaint > 0) { if (icy_metaint > 0) {
if (src->icy_caps) if (src->src_caps)
gst_caps_unref (src->icy_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); "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), rc = gst_pad_alloc_buffer (GST_BASE_SRC_PAD (basesrc),
GST_BUFFER_OFFSET_NONE, length, 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); GST_PAD_CAPS (GST_BASE_SRC_PAD (basesrc)), &gstbuf);
if (G_UNLIKELY (rc != GST_FLOW_OK)) { if (G_UNLIKELY (rc != GST_FLOW_OK)) {
/* Failed to allocate buffer. Stall SoupSession and return error code /* 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_OFFSET (*src->outbuf) = basesrc->segment.last_stop;
gst_buffer_set_caps (*src->outbuf, 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))); GST_PAD_CAPS (GST_BASE_SRC_PAD (basesrc)));
new_position = src->read_position + chunk->length; new_position = src->read_position + chunk->length;

2
ext/soup/gstsouphttpsrc.h
View file

@ -78,7 +78,7 @@ struct _GstSoupHTTPSrc {
/* Shoutcast/icecast metadata extraction handling. */ /* Shoutcast/icecast metadata extraction handling. */
gboolean iradio_mode; gboolean iradio_mode;
GstCaps *icy_caps; GstCaps *src_caps;
gchar *iradio_name; gchar *iradio_name;
gchar *iradio_genre; gchar *iradio_genre;
gchar *iradio_url; gchar *iradio_url;