<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165106] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165106">165106</a></dd>
<dt>Author</dt> <dd>agomez@igalia.com</dd>
<dt>Date</dt> <dd>2014-03-05 06:49:04 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165105 => 165106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-05 Andres Gomez <agomez@igalia.com>
+
+ [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):
+
</ins><span class="cx"> 2014-03-05 Chang Shu <cshu@webkit.org>
</span><span class="cx">
</span><span class="cx"> Copying wrapping text results in multiple spaces between wrapped lines stripped.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (165105 => 165106)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx"> GRefPtr<GstBuffer> buffer;
</span><span class="cx">
</span><span class="cx"> // icecast stuff
</span><del>- gboolean iradioMode;
</del><span class="cx"> gchar* iradioName;
</span><span class="cx"> gchar* iradioGenre;
</span><span class="cx"> gchar* iradioUrl;
</span><span class="lines">@@ -143,8 +142,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- PROP_IRADIO_MODE = 1,
- PROP_IRADIO_NAME,
</del><ins>+ PROP_IRADIO_NAME = 1,
</ins><span class="cx"> PROP_IRADIO_GENRE,
</span><span class="cx"> PROP_IRADIO_URL,
</span><span class="cx"> PROP_IRADIO_TITLE,
</span><span class="lines">@@ -204,14 +202,6 @@
</span><span class="cx">
</span><span class="cx"> // icecast stuff
</span><span class="cx"> g_object_class_install_property(oklass,
</span><del>- 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,
</del><span class="cx"> PROP_IRADIO_NAME,
</span><span class="cx"> g_param_spec_string("iradio-name",
</span><span class="cx"> "iradio-name",
</span><span class="lines">@@ -331,14 +321,8 @@
</span><span class="cx"> static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
</span><del>- WebKitWebSrcPrivate* priv = src->priv;
</del><span class="cx">
</span><span class="cx"> switch (propID) {
</span><del>- case PROP_IRADIO_MODE: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->iradioMode = g_value_get_boolean(value);
- break;
- }
</del><span class="cx"> case PROP_LOCATION:
</span><span class="cx"> gst_uri_handler_set_uri(reinterpret_cast<GstURIHandler*>(src), g_value_get_string(value), 0);
</span><span class="cx"> break;
</span><span class="lines">@@ -355,9 +339,6 @@
</span><span class="cx">
</span><span class="cx"> GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</span><span class="cx"> switch (propID) {
</span><del>- case PROP_IRADIO_MODE:
- g_value_set_boolean(value, priv->iradioMode);
- break;
</del><span class="cx"> case PROP_IRADIO_NAME:
</span><span class="cx"> g_value_set_string(value, priv->iradioName);
</span><span class="cx"> break;
</span><span class="lines">@@ -507,8 +488,8 @@
</span><span class="cx"> }
</span><span class="cx"> priv->offset = priv->requestedOffset;
</span><span class="cx">
</span><del>- if (priv->iradioMode)
- request.setHTTPHeaderField("icy-metadata", "1");
</del><ins>+ // We always request Icecast/Shoutcast metadata, just in case ...
+ request.setHTTPHeaderField("icy-metadata", "1");
</ins><span class="cx">
</span><span class="cx"> // Needed to use DLNA streaming servers
</span><span class="cx"> request.setHTTPHeaderField("transferMode.dlna", "Streaming");
</span></span></pre>
</div>
</div>
</body>
</html>