<!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>[191947] 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/191947">191947</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-03 02:40:06 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Cleanup the iradio properties
https://bugs.webkit.org/show_bug.cgi?id=148522
Reviewed by Philippe Normand.
Remove unused icecast code.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(StreamingClient::handleResponseReceived):
(webKitWebSrcGetProperty): Deleted.
(webKitWebSrcStop): Deleted.</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 (191946 => 191947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-03 10:36:20 UTC (rev 191946)
+++ trunk/Source/WebCore/ChangeLog 2015-11-03 10:40:06 UTC (rev 191947)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GStreamer] Cleanup the iradio properties
+ https://bugs.webkit.org/show_bug.cgi?id=148522
+
+ Reviewed by Philippe Normand.
+
+ Remove unused icecast code.
+
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (StreamingClient::handleResponseReceived):
+ (webKitWebSrcGetProperty): Deleted.
+ (webKitWebSrcStop): Deleted.
+
</ins><span class="cx"> 2015-11-02 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> input[type=number] does not increment/decrement integers with trailing decimal characters
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (191946 => 191947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-11-03 10:36:20 UTC (rev 191946)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-11-03 10:40:06 UTC (rev 191947)
</span><span class="lines">@@ -137,19 +137,10 @@
</span><span class="cx"> GThreadSafeMainLoopSource seekSource;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GstBuffer> buffer;
</span><del>-
- // icecast stuff
- gchar* iradioName;
- gchar* iradioGenre;
- gchar* iradioUrl;
- gchar* iradioTitle;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- PROP_IRADIO_NAME = 1,
- PROP_IRADIO_GENRE,
- PROP_IRADIO_URL,
- PROP_IRADIO_TITLE,
</del><ins>+ PROP_0,
</ins><span class="cx"> PROP_LOCATION,
</span><span class="cx"> PROP_KEEP_ALIVE,
</span><span class="cx"> PROP_EXTRA_HEADERS,
</span><span class="lines">@@ -208,40 +199,6 @@
</span><span class="cx"> gst_element_class_set_metadata(eklass, "WebKit Web source element", "Source", "Handles HTTP/HTTPS uris",
</span><span class="cx"> "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
</span><span class="cx">
</span><del>- // icecast stuff
- g_object_class_install_property(oklass,
- PROP_IRADIO_NAME,
- g_param_spec_string("iradio-name",
- "iradio-name",
- "Name of the stream",
- 0,
- (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
- g_object_class_install_property(oklass,
- PROP_IRADIO_GENRE,
- g_param_spec_string("iradio-genre",
- "iradio-genre",
- "Genre of the stream",
- 0,
- (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
- g_object_class_install_property(oklass,
- PROP_IRADIO_URL,
- g_param_spec_string("iradio-url",
- "iradio-url",
- "Homepage URL for radio stream",
- 0,
- (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
- g_object_class_install_property(oklass,
- PROP_IRADIO_TITLE,
- g_param_spec_string("iradio-title",
- "iradio-title",
- "Name of currently playing song",
- 0,
- (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
-
</del><span class="cx"> /* Allows setting the uri using the 'location' property, which is used
</span><span class="cx"> * for example by gst_element_make_from_uri() */
</span><span class="cx"> g_object_class_install_property(oklass,
</span><span class="lines">@@ -380,18 +337,6 @@
</span><span class="cx">
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="cx"> switch (propID) {
</span><del>- case PROP_IRADIO_NAME:
- g_value_set_string(value, priv->iradioName);
- break;
- case PROP_IRADIO_GENRE:
- g_value_set_string(value, priv->iradioGenre);
- break;
- case PROP_IRADIO_URL:
- g_value_set_string(value, priv->iradioUrl);
- break;
- case PROP_IRADIO_TITLE:
- g_value_set_string(value, priv->iradioTitle);
- break;
</del><span class="cx"> case PROP_LOCATION:
</span><span class="cx"> g_value_set_string(value, priv->uri);
</span><span class="cx"> break;
</span><span class="lines">@@ -451,18 +396,6 @@
</span><span class="cx">
</span><span class="cx"> priv->paused = FALSE;
</span><span class="cx">
</span><del>- g_free(priv->iradioName);
- priv->iradioName = 0;
-
- g_free(priv->iradioGenre);
- priv->iradioGenre = 0;
-
- g_free(priv->iradioUrl);
- priv->iradioUrl = 0;
-
- g_free(priv->iradioTitle);
- priv->iradioTitle = 0;
-
</del><span class="cx"> priv->offset = 0;
</span><span class="cx"> priv->seekable = FALSE;
</span><span class="cx">
</span><span class="lines">@@ -982,41 +915,7 @@
</span><span class="cx"> priv->size = length >= 0 ? length : 0;
</span><span class="cx"> priv->seekable = length > 0 && g_ascii_strcasecmp("none", response.httpHeaderField(HTTPHeaderName::AcceptRanges).utf8().data());
</span><span class="cx">
</span><del>- // Wait until we unlock to send notifications
- g_object_freeze_notify(G_OBJECT(src));
-
- GstTagList* tags = gst_tag_list_new_empty();
- String value = response.httpHeaderField(HTTPHeaderName::IcyName);
- if (!value.isEmpty()) {
- g_free(priv->iradioName);
- priv->iradioName = g_strdup(value.utf8().data());
- g_object_notify(G_OBJECT(src), "iradio-name");
- gst_tag_list_add(tags, GST_TAG_MERGE_REPLACE, GST_TAG_ORGANIZATION, priv->iradioName, NULL);
- }
- value = response.httpHeaderField(HTTPHeaderName::IcyGenre);
- if (!value.isEmpty()) {
- g_free(priv->iradioGenre);
- priv->iradioGenre = g_strdup(value.utf8().data());
- g_object_notify(G_OBJECT(src), "iradio-genre");
- gst_tag_list_add(tags, GST_TAG_MERGE_REPLACE, GST_TAG_GENRE, priv->iradioGenre, NULL);
- }
- value = response.httpHeaderField(HTTPHeaderName::IcyURL);
- if (!value.isEmpty()) {
- g_free(priv->iradioUrl);
- priv->iradioUrl = g_strdup(value.utf8().data());
- g_object_notify(G_OBJECT(src), "iradio-url");
- gst_tag_list_add(tags, GST_TAG_MERGE_REPLACE, GST_TAG_LOCATION, priv->iradioUrl, NULL);
- }
- value = response.httpHeaderField(HTTPHeaderName::IcyTitle);
- if (!value.isEmpty()) {
- g_free(priv->iradioTitle);
- priv->iradioTitle = g_strdup(value.utf8().data());
- g_object_notify(G_OBJECT(src), "iradio-title");
- gst_tag_list_add(tags, GST_TAG_MERGE_REPLACE, GST_TAG_TITLE, priv->iradioTitle, NULL);
- }
-
</del><span class="cx"> locker.unlock();
</span><del>- g_object_thaw_notify(G_OBJECT(src));
</del><span class="cx">
</span><span class="cx"> // notify size/duration
</span><span class="cx"> if (length > 0) {
</span><span class="lines">@@ -1024,25 +923,7 @@
</span><span class="cx"> } else
</span><span class="cx"> gst_app_src_set_size(priv->appsrc, -1);
</span><span class="cx">
</span><del>- // icecast stuff
- value = response.httpHeaderField(HTTPHeaderName::IcyMetaInt);
- if (!value.isEmpty()) {
- gchar* endptr = 0;
- gint64 icyMetaInt = g_ascii_strtoll(value.utf8().data(), &endptr, 10);
-
- if (endptr && *endptr == '\0' && icyMetaInt > 0) {
- GRefPtr<GstCaps> caps = adoptGRef(gst_caps_new_simple("application/x-icy", "metadata-interval", G_TYPE_INT, (gint) icyMetaInt, NULL));
-
- gst_app_src_set_caps(priv->appsrc, caps.get());
- }
- } else
- gst_app_src_set_caps(priv->appsrc, 0);
-
- // notify tags
- if (gst_tag_list_is_empty(tags))
- gst_tag_list_unref(tags);
- else
- gst_pad_push_event(priv->srcpad, gst_event_new_tag(tags));
</del><ins>+ gst_app_src_set_caps(priv->appsrc, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StreamingClient::handleDataReceived(const char* data, int length)
</span></span></pre>
</div>
</div>
</body>
</html>