souphttpsrc: always send icecast request header, drop iradio-mode property

Server should ignore unknown/unhandled headers..
This commit is contained in:
Tim-Philipp Müller 2011-11-24 01:40:06 +00:00
parent 87aa29d2cf
commit 3f7c432869
2 changed files with 2 additions and 19 deletions

View file

@ -107,7 +107,6 @@ enum
PROP_PROXY_ID,
PROP_PROXY_PW,
PROP_COOKIES,
PROP_IRADIO_MODE,
PROP_IRADIO_NAME,
PROP_IRADIO_GENRE,
PROP_IRADIO_URL,
@ -245,12 +244,6 @@ gst_soup_http_src_class_init (GstSoupHTTPSrcClass * klass)
GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/* icecast stuff */
g_object_class_install_property (gobject_class,
PROP_IRADIO_MODE,
g_param_spec_boolean ("iradio-mode",
"iradio-mode",
"Enable internet radio mode (extraction of shoutcast/icecast metadata)",
FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_IRADIO_NAME,
g_param_spec_string ("iradio-name",
@ -334,7 +327,6 @@ gst_soup_http_src_init (GstSoupHTTPSrc * src)
src->proxy_id = NULL;
src->proxy_pw = NULL;
src->cookies = NULL;
src->iradio_mode = FALSE;
src->loop = NULL;
src->context = NULL;
src->session = NULL;
@ -398,9 +390,6 @@ gst_soup_http_src_set_property (GObject * object, guint prop_id,
g_free (src->user_agent);
src->user_agent = g_value_dup_string (value);
break;
case PROP_IRADIO_MODE:
src->iradio_mode = g_value_get_boolean (value);
break;
case PROP_AUTOMATIC_REDIRECT:
src->automatic_redirect = g_value_get_boolean (value);
break;
@ -499,9 +488,6 @@ gst_soup_http_src_get_property (GObject * object, guint prop_id,
case PROP_IS_LIVE:
g_value_set_boolean (value, gst_base_src_is_live (GST_BASE_SRC (src)));
break;
case PROP_IRADIO_MODE:
g_value_set_boolean (value, src->iradio_mode);
break;
case PROP_IRADIO_NAME:
g_value_set_string (value, src->iradio_name);
break;
@ -1122,10 +1108,8 @@ gst_soup_http_src_build_message (GstSoupHTTPSrc * src)
src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE;
soup_message_headers_append (src->msg->request_headers, "Connection",
"close");
if (src->iradio_mode) {
soup_message_headers_append (src->msg->request_headers, "icy-metadata",
"1");
}
soup_message_headers_append (src->msg->request_headers, "icy-metadata", "1");
if (src->cookies) {
gchar **cookie;

View file

@ -77,7 +77,6 @@ struct _GstSoupHTTPSrc {
guint64 request_position; /* Seek to this position. */
/* Shoutcast/icecast metadata extraction handling. */
gboolean iradio_mode;
GstCaps *src_caps;
gchar *iradio_name;
gchar *iradio_genre;