From 7817bf24f34d875698a113fcc89c481afb2ae59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 24 Nov 2011 01:52:36 +0000
Subject: [PATCH] neonhttpsrc: unconditionally send icecast request header,
 remove iradio-mode property

---
 ext/neon/gstneonhttpsrc.c | 20 ++------------------
 ext/neon/gstneonhttpsrc.h |  1 -
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index ea09057956..179454f0af 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -69,7 +69,6 @@ enum
   PROP_PROXY,
   PROP_USER_AGENT,
   PROP_COOKIES,
-  PROP_IRADIO_MODE,
   PROP_IRADIO_NAME,
   PROP_IRADIO_GENRE,
   PROP_IRADIO_URL,
@@ -191,12 +190,6 @@ gst_neonhttp_src_class_init (GstNeonhttpSrcClass * klass)
       g_param_spec_boxed ("cookies", "Cookies", "HTTP request cookies",
           G_TYPE_STRV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  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",
@@ -283,7 +276,6 @@ gst_neonhttp_src_init (GstNeonhttpSrc * src, GstNeonhttpSrcClass * g_class)
   const gchar *str;
 
   src->neon_http_debug = DEFAULT_NEON_HTTP_DEBUG;
-  src->iradio_mode = DEFAULT_IRADIO_MODE;
   src->iradio_name = DEFAULT_IRADIO_NAME;
   src->iradio_genre = DEFAULT_IRADIO_GENRE;
   src->iradio_url = DEFAULT_IRADIO_URL;
@@ -406,9 +398,6 @@ gst_neonhttp_src_set_property (GObject * object, guint prop_id,
         g_strfreev (src->cookies);
       src->cookies = (gchar **) g_value_dup_boxed (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;
@@ -477,9 +466,6 @@ gst_neonhttp_src_get_property (GObject * object, guint prop_id,
     case PROP_COOKIES:
       g_value_set_boxed (value, neonhttpsrc->cookies);
       break;
-    case PROP_IRADIO_MODE:
-      g_value_set_boolean (value, neonhttpsrc->iradio_mode);
-      break;
     case PROP_IRADIO_NAME:
       g_value_set_string (value, neonhttpsrc->iradio_name);
       break;
@@ -608,7 +594,7 @@ gst_neonhttp_src_start (GstBaseSrc * bsrc)
   else
     src->content_size = -1;
 
-  if (src->iradio_mode) {
+  if (TRUE) {
     /* Icecast stuff */
     const gchar *str_value;
     gint gint_value;
@@ -962,9 +948,7 @@ gst_neonhttp_src_send_request_and_redirect (GstNeonhttpSrc * src,
       ne_add_request_header (request, "Cookies", *c);
     }
 
-    if (src->iradio_mode) {
-      ne_add_request_header (request, "icy-metadata", "1");
-    }
+    ne_add_request_header (request, "icy-metadata", "1");
 
     if (offset > 0) {
       ne_print_request_header (request, "Range",
diff --git a/ext/neon/gstneonhttpsrc.h b/ext/neon/gstneonhttpsrc.h
index e3207691a9..4d2b1c0752 100644
--- a/ext/neon/gstneonhttpsrc.h
+++ b/ext/neon/gstneonhttpsrc.h
@@ -59,7 +59,6 @@ struct _GstNeonhttpSrc {
   gboolean eos;
 
   /* icecast/audiocast metadata extraction handling */
-  gboolean iradio_mode;
   gchar *iradio_name;
   gchar *iradio_genre;
   gchar *iradio_url;