Modified: trunk/Source/WebCore/ChangeLog (165105 => 165106)
--- trunk/Source/WebCore/ChangeLog 2014-03-05 14:02:06 UTC (rev 165105)
+++ trunk/Source/WebCore/ChangeLog 2014-03-05 14:49:04 UTC (rev 165106)
@@ -1,3 +1,23 @@
+2014-03-05 Andres Gomez <[email protected]>
+
+ [GStreamer] WebSource doesn't need the "iradio-mode" property
+ https://bugs.webkit.org/show_bug.cgi?id=129685
+
+ Reviewed by Philippe Normand.
+
+ Removed the "iradio-mode" property from the WK source element
+ since this was only available for its modification from
+ playbin/uridecodebin and, as discussed in GStreamer bug #725383,
+ it was not being set and now is going to be removed.
+
+ It is safe just to send always the "icy-metadata" header set and
+ deal with returning "icy" headers as we were already doing.
+
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcSetProperty):
+ (webKitWebSrcGetProperty):
+ (webKitWebSrcStart):
+
2014-03-05 Chang Shu <[email protected]>
Copying wrapping text results in multiple spaces between wrapped lines stripped.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (165105 => 165106)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-03-05 14:02:06 UTC (rev 165105)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-03-05 14:49:04 UTC (rev 165106)
@@ -135,7 +135,6 @@
GRefPtr<GstBuffer> buffer;
// icecast stuff
- gboolean iradioMode;
gchar* iradioName;
gchar* iradioGenre;
gchar* iradioUrl;
@@ -143,8 +142,7 @@
};
enum {
- PROP_IRADIO_MODE = 1,
- PROP_IRADIO_NAME,
+ PROP_IRADIO_NAME = 1,
PROP_IRADIO_GENRE,
PROP_IRADIO_URL,
PROP_IRADIO_TITLE,
@@ -204,14 +202,6 @@
// icecast stuff
g_object_class_install_property(oklass,
- PROP_IRADIO_MODE,
- g_param_spec_boolean("iradio-mode",
- "iradio-mode",
- "Enable internet radio mode (extraction of shoutcast/icecast metadata)",
- FALSE,
- (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
- g_object_class_install_property(oklass,
PROP_IRADIO_NAME,
g_param_spec_string("iradio-name",
"iradio-name",
@@ -331,14 +321,8 @@
static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* value, GParamSpec* pspec)
{
WebKitWebSrc* src = ""
- WebKitWebSrcPrivate* priv = src->priv;
switch (propID) {
- case PROP_IRADIO_MODE: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->iradioMode = g_value_get_boolean(value);
- break;
- }
case PROP_LOCATION:
gst_uri_handler_set_uri(reinterpret_cast<GstURIHandler*>(src), g_value_get_string(value), 0);
break;
@@ -355,9 +339,6 @@
GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
switch (propID) {
- case PROP_IRADIO_MODE:
- g_value_set_boolean(value, priv->iradioMode);
- break;
case PROP_IRADIO_NAME:
g_value_set_string(value, priv->iradioName);
break;
@@ -507,8 +488,8 @@
}
priv->offset = priv->requestedOffset;
- if (priv->iradioMode)
- request.setHTTPHeaderField("icy-metadata", "1");
+ // We always request Icecast/Shoutcast metadata, just in case ...
+ request.setHTTPHeaderField("icy-metadata", "1");
// Needed to use DLNA streaming servers
request.setHTTPHeaderField("transferMode.dlna", "Streaming");
