<!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>[213813] releases/WebKitGTK/webkit-2.16/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/213813">213813</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 03:41:21 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213445">r213445</a> - [GStreamer] Adopt nullptr
https://bugs.webkit.org/show_bug.cgi?id=123438
Patch by Vanessa Chipirrás Navalón <vchipirras@igalia.com> on 2017-03-06
Reviewed by Xabier Rodriguez-Calvar.
To adapt the code to the C++11 standard, all NULL or 0 pointers have been changed to nullptr.
* platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
(WebCore::AudioDestinationGStreamer::AudioDestinationGStreamer):
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::AudioFileReader::handleNewDeinterleavePad):
(WebCore::AudioFileReader::plugDeinterleave):
(WebCore::AudioFileReader::decodeAudioForBusCreation):
* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
(WebCore::AudioSourceProviderGStreamer::AudioSourceProviderGStreamer):
(WebCore::AudioSourceProviderGStreamer::configureAudioBin):
(WebCore::AudioSourceProviderGStreamer::setClient):
(WebCore::AudioSourceProviderGStreamer::handleNewDeinterleavePad):
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
(webkit_web_audio_src_init):
(webKitWebAudioSrcLoop):
(webKitWebAudioSrcChangeState):
* platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
(WebCore::AudioTrackPrivateGStreamer::setEnabled):
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
(WebCore::MediaPlayerPrivateGStreamer::registerMediaEngine):
(WebCore::initializeGStreamerAndRegisterWebKitElements):
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::newTextSample):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::processTableOfContents):
Removed the unused second argument on processTableOfContentsEntry function.
(WebCore::MediaPlayerPrivateGStreamer::processTableOfContentsEntry):
Removed the unused second argument on this function.
(WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
(WebCore::MediaPlayerPrivateGStreamer::loadNextLocation):
(WebCore::MediaPlayerPrivateGStreamer::createAudioSink):
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
Removed the unused second argument on processTableOfContentsEntry function.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::setMuted):
(WebCore::MediaPlayerPrivateGStreamerBase::muted):
(WebCore::MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute):
(WebCore::MediaPlayerPrivateGStreamerBase::setStreamVolumeElement):
(WebCore::MediaPlayerPrivateGStreamerBase::decodedFrameCount):
(WebCore::MediaPlayerPrivateGStreamerBase::droppedFrameCount):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
(WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkit_text_combiner_init):
(webkitTextCombinerPadEvent):
(webkitTextCombinerRequestNewPad):
(webkitTextCombinerNew):
* platform/graphics/gstreamer/TextSinkGStreamer.cpp:
(webkitTextSinkNew):
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkit_video_sink_init):
(webkitVideoSinkProposeAllocation):
(webkitVideoSinkNew):
* platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
(WebCore::VideoTrackPrivateGStreamer::setSelected):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webkit_web_src_init):
(webKitWebSrcDispose):
(webKitWebSrcSetProperty):
(webKitWebSrcStop):
(webKitWebSrcChangeState):
(webKitWebSrcQueryWithParent):
(webKitWebSrcGetProtocols):
(StreamingClient::handleResponseReceived):
(StreamingClient::handleDataReceived):
(ResourceHandleStreamingClient::didFail):
(ResourceHandleStreamingClient::wasBlocked):
(ResourceHandleStreamingClient::cannotShowURL):
* platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcGetProtocols):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerAudioTrackPrivateGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTextCombinerGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTextSinkGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerVideoTrackPrivateGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamermseWebKitMediaSourceGStreamercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -1,3 +1,91 @@
</span><ins>+2017-03-06 Vanessa Chipirrás Navalón <vchipirras@igalia.com>
+
+ [GStreamer] Adopt nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=123438
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ To adapt the code to the C++11 standard, all NULL or 0 pointers have been changed to nullptr.
+
+ * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+ (WebCore::AudioDestinationGStreamer::AudioDestinationGStreamer):
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::AudioFileReader::handleNewDeinterleavePad):
+ (WebCore::AudioFileReader::plugDeinterleave):
+ (WebCore::AudioFileReader::decodeAudioForBusCreation):
+ * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+ (WebCore::AudioSourceProviderGStreamer::AudioSourceProviderGStreamer):
+ (WebCore::AudioSourceProviderGStreamer::configureAudioBin):
+ (WebCore::AudioSourceProviderGStreamer::setClient):
+ (WebCore::AudioSourceProviderGStreamer::handleNewDeinterleavePad):
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ (webkit_web_audio_src_init):
+ (webKitWebAudioSrcLoop):
+ (webKitWebAudioSrcChangeState):
+ * platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
+ (WebCore::AudioTrackPrivateGStreamer::setEnabled):
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::initializeGStreamer):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
+ (WebCore::MediaPlayerPrivateGStreamer::registerMediaEngine):
+ (WebCore::initializeGStreamerAndRegisterWebKitElements):
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::newTextSample):
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+ (WebCore::MediaPlayerPrivateGStreamer::processTableOfContents):
+ Removed the unused second argument on processTableOfContentsEntry function.
+ (WebCore::MediaPlayerPrivateGStreamer::processTableOfContentsEntry):
+ Removed the unused second argument on this function.
+ (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
+ (WebCore::MediaPlayerPrivateGStreamer::loadNextLocation):
+ (WebCore::MediaPlayerPrivateGStreamer::createAudioSink):
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ Removed the unused second argument on processTableOfContentsEntry function.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+ (WebCore::MediaPlayerPrivateGStreamerBase::setMuted):
+ (WebCore::MediaPlayerPrivateGStreamerBase::muted):
+ (WebCore::MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute):
+ (WebCore::MediaPlayerPrivateGStreamerBase::setStreamVolumeElement):
+ (WebCore::MediaPlayerPrivateGStreamerBase::decodedFrameCount):
+ (WebCore::MediaPlayerPrivateGStreamerBase::droppedFrameCount):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
+ * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+ (webkit_text_combiner_init):
+ (webkitTextCombinerPadEvent):
+ (webkitTextCombinerRequestNewPad):
+ (webkitTextCombinerNew):
+ * platform/graphics/gstreamer/TextSinkGStreamer.cpp:
+ (webkitTextSinkNew):
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkit_video_sink_init):
+ (webkitVideoSinkProposeAllocation):
+ (webkitVideoSinkNew):
+ * platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
+ (WebCore::VideoTrackPrivateGStreamer::setSelected):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webkit_web_src_init):
+ (webKitWebSrcDispose):
+ (webKitWebSrcSetProperty):
+ (webKitWebSrcStop):
+ (webKitWebSrcChangeState):
+ (webKitWebSrcQueryWithParent):
+ (webKitWebSrcGetProtocols):
+ (StreamingClient::handleResponseReceived):
+ (StreamingClient::handleDataReceived):
+ (ResourceHandleStreamingClient::didFail):
+ (ResourceHandleStreamingClient::wasBlocked):
+ (ResourceHandleStreamingClient::cannotShowURL):
+ * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
+ (webKitMediaSrcGetProtocols):
+
</ins><span class="cx"> 2017-03-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid backing store for layers with empty text nodes in a few more cases
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> "rate", sampleRate,
</span><span class="cx"> "bus", m_renderBus.get(),
</span><span class="cx"> "provider", &m_callback,
</span><del>- "frames", framesToPull, NULL));
</del><ins>+ "frames", framesToPull, nullptr));
</ins><span class="cx">
</span><del>- GRefPtr<GstElement> audioSink = gst_element_factory_make("autoaudiosink", 0);
</del><ins>+ GRefPtr<GstElement> audioSink = gst_element_factory_make("autoaudiosink", nullptr);
</ins><span class="cx"> m_audioSinkAvailable = audioSink;
</span><span class="cx"> if (!audioSink) {
</span><span class="cx"> LOG_ERROR("Failed to create GStreamer autoaudiosink element");
</span><span class="lines">@@ -114,9 +114,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GstElement* audioConvert = gst_element_factory_make("audioconvert", 0);
- GstElement* audioResample = gst_element_factory_make("audioresample", 0);
- gst_bin_add_many(GST_BIN(m_pipeline), webkitAudioSrc, audioConvert, audioResample, audioSink.get(), NULL);
</del><ins>+ GstElement* audioConvert = gst_element_factory_make("audioconvert", nullptr);
+ GstElement* audioResample = gst_element_factory_make("audioresample", nullptr);
+ gst_bin_add_many(GST_BIN(m_pipeline), webkitAudioSrc, audioConvert, audioResample, audioSink.get(), nullptr);
</ins><span class="cx">
</span><span class="cx"> // Link src pads from webkitAudioSrc to audioConvert ! audioResample ! autoaudiosink.
</span><span class="cx"> gst_element_link_pads_full(webkitAudioSrc, "src", audioConvert, "sink", GST_PAD_LINK_CHECK_NOTHING);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> // in an appsink so we can pull the data from each
</span><span class="cx"> // channel. Pipeline looks like:
</span><span class="cx"> // ... deinterleave ! queue ! appsink.
</span><del>- GstElement* queue = gst_element_factory_make("queue", 0);
- GstElement* sink = gst_element_factory_make("appsink", 0);
</del><ins>+ GstElement* queue = gst_element_factory_make("queue", nullptr);
+ GstElement* sink = gst_element_factory_make("appsink", nullptr);
</ins><span class="cx">
</span><span class="cx"> static GstAppSinkCallbacks callbacks = {
</span><span class="cx"> nullptr, // eos
</span><span class="lines">@@ -225,9 +225,9 @@
</span><span class="cx"> },
</span><span class="cx"> { nullptr }
</span><span class="cx"> };
</span><del>- gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);
</del><ins>+ gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, nullptr);
</ins><span class="cx">
</span><del>- g_object_set(sink, "sync", FALSE, NULL);
</del><ins>+ g_object_set(sink, "sync", FALSE, nullptr);
</ins><span class="cx">
</span><span class="cx"> gst_bin_add_many(GST_BIN(m_pipeline.get()), queue, sink, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -256,12 +256,12 @@
</span><span class="cx"> // A decodebin pad was added, plug in a deinterleave element to
</span><span class="cx"> // separate each planar channel. Sub pipeline looks like
</span><span class="cx"> // ... decodebin2 ! audioconvert ! audioresample ! capsfilter ! deinterleave.
</span><del>- GstElement* audioConvert = gst_element_factory_make("audioconvert", 0);
- GstElement* audioResample = gst_element_factory_make("audioresample", 0);
- GstElement* capsFilter = gst_element_factory_make("capsfilter", 0);
</del><ins>+ GstElement* audioConvert = gst_element_factory_make("audioconvert", nullptr);
+ GstElement* audioResample = gst_element_factory_make("audioresample", nullptr);
+ GstElement* capsFilter = gst_element_factory_make("capsfilter", nullptr);
</ins><span class="cx"> m_deInterleave = gst_element_factory_make("deinterleave", "deinterleave");
</span><span class="cx">
</span><del>- g_object_set(m_deInterleave.get(), "keep-positions", TRUE, NULL);
</del><ins>+ g_object_set(m_deInterleave.get(), "keep-positions", TRUE, nullptr);
</ins><span class="cx"> g_signal_connect_swapped(m_deInterleave.get(), "pad-added", G_CALLBACK(deinterleavePadAddedCallback), this);
</span><span class="cx"> g_signal_connect_swapped(m_deInterleave.get(), "no-more-pads", G_CALLBACK(deinterleaveReadyCallback), this);
</span><span class="cx">
</span><span class="lines">@@ -316,18 +316,18 @@
</span><span class="cx"> GstElement* source;
</span><span class="cx"> if (m_data) {
</span><span class="cx"> ASSERT(m_dataSize);
</span><del>- source = gst_element_factory_make("giostreamsrc", 0);
- GRefPtr<GInputStream> memoryStream = adoptGRef(g_memory_input_stream_new_from_data(m_data, m_dataSize, 0));
- g_object_set(source, "stream", memoryStream.get(), NULL);
</del><ins>+ source = gst_element_factory_make("giostreamsrc", nullptr);
+ GRefPtr<GInputStream> memoryStream = adoptGRef(g_memory_input_stream_new_from_data(m_data, m_dataSize, nullptr));
+ g_object_set(source, "stream", memoryStream.get(), nullptr);
</ins><span class="cx"> } else {
</span><del>- source = gst_element_factory_make("filesrc", 0);
- g_object_set(source, "location", m_filePath, NULL);
</del><ins>+ source = gst_element_factory_make("filesrc", nullptr);
+ g_object_set(source, "location", m_filePath, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_decodebin = gst_element_factory_make("decodebin", "decodebin");
</span><span class="cx"> g_signal_connect_swapped(m_decodebin.get(), "pad-added", G_CALLBACK(decodebinPadAddedCallback), this);
</span><span class="cx">
</span><del>- gst_bin_add_many(GST_BIN(m_pipeline.get()), source, m_decodebin.get(), NULL);
</del><ins>+ gst_bin_add_many(GST_BIN(m_pipeline.get()), source, m_decodebin.get(), nullptr);
</ins><span class="cx"> gst_element_link_pads_full(source, "src", m_decodebin.get(), "sink", GST_PAD_LINK_CHECK_NOTHING);
</span><span class="cx">
</span><span class="cx"> // Catch errors here immediately, there might not be an error message if we're unlucky.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AudioSourceProviderGStreamer::AudioSourceProviderGStreamer()
</span><del>- : m_client(0)
</del><ins>+ : m_client(nullptr)
</ins><span class="cx"> , m_deinterleaveSourcePads(0)
</span><span class="cx"> , m_deinterleavePadAddedHandlerId(0)
</span><span class="cx"> , m_deinterleaveNoMorePadsHandlerId(0)
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx"> m_audioSinkBin = audioBin;
</span><span class="cx">
</span><span class="cx"> GstElement* audioTee = gst_element_factory_make("tee", "audioTee");
</span><del>- GstElement* audioQueue = gst_element_factory_make("queue", 0);
- GstElement* audioConvert = gst_element_factory_make("audioconvert", 0);
- GstElement* audioConvert2 = gst_element_factory_make("audioconvert", 0);
- GstElement* audioResample = gst_element_factory_make("audioresample", 0);
- GstElement* audioResample2 = gst_element_factory_make("audioresample", 0);
</del><ins>+ GstElement* audioQueue = gst_element_factory_make("queue", nullptr);
+ GstElement* audioConvert = gst_element_factory_make("audioconvert", nullptr);
+ GstElement* audioConvert2 = gst_element_factory_make("audioconvert", nullptr);
+ GstElement* audioResample = gst_element_factory_make("audioresample", nullptr);
+ GstElement* audioResample2 = gst_element_factory_make("audioresample", nullptr);
</ins><span class="cx"> GstElement* volumeElement = gst_element_factory_make("volume", "volume");
</span><del>- GstElement* audioSink = gst_element_factory_make("autoaudiosink", 0);
</del><ins>+ GstElement* audioSink = gst_element_factory_make("autoaudiosink", nullptr);
</ins><span class="cx">
</span><span class="cx"> gst_bin_add_many(GST_BIN(m_audioSinkBin.get()), audioTee, audioQueue, audioConvert, audioResample, volumeElement, audioConvert2, audioResample2, audioSink, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -211,10 +211,10 @@
</span><span class="cx"> // The audioconvert and audioresample elements are needed to
</span><span class="cx"> // ensure deinterleave and the sinks downstream receive buffers in
</span><span class="cx"> // the format specified by the capsfilter.
</span><del>- GstElement* audioQueue = gst_element_factory_make("queue", 0);
- GstElement* audioConvert = gst_element_factory_make("audioconvert", 0);
- GstElement* audioResample = gst_element_factory_make("audioresample", 0);
- GstElement* capsFilter = gst_element_factory_make("capsfilter", 0);
</del><ins>+ GstElement* audioQueue = gst_element_factory_make("queue", nullptr);
+ GstElement* audioConvert = gst_element_factory_make("audioconvert", nullptr);
+ GstElement* audioResample = gst_element_factory_make("audioresample", nullptr);
+ GstElement* capsFilter = gst_element_factory_make("capsfilter", nullptr);
</ins><span class="cx"> GstElement* deInterleave = gst_element_factory_make("deinterleave", "deinterleave");
</span><span class="cx">
</span><span class="cx"> g_object_set(deInterleave, "keep-positions", TRUE, nullptr);
</span><span class="lines">@@ -257,8 +257,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_deinterleaveSourcePads > 2) {
</span><span class="cx"> g_warning("The AudioSourceProvider supports only mono and stereo audio. Silencing out this new channel.");
</span><del>- GstElement* queue = gst_element_factory_make("queue", 0);
- GstElement* sink = gst_element_factory_make("fakesink", 0);
</del><ins>+ GstElement* queue = gst_element_factory_make("queue", nullptr);
+ GstElement* sink = gst_element_factory_make("fakesink", nullptr);
</ins><span class="cx"> g_object_set(sink, "async", FALSE, nullptr);
</span><span class="cx"> gst_bin_add_many(GST_BIN(m_audioSinkBin.get()), queue, sink, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -277,14 +277,14 @@
</span><span class="cx"> // in an appsink so we can pull the data from each
</span><span class="cx"> // channel. Pipeline looks like:
</span><span class="cx"> // ... deinterleave ! queue ! appsink.
</span><del>- GstElement* queue = gst_element_factory_make("queue", 0);
- GstElement* sink = gst_element_factory_make("appsink", 0);
</del><ins>+ GstElement* queue = gst_element_factory_make("queue", nullptr);
+ GstElement* sink = gst_element_factory_make("appsink", nullptr);
</ins><span class="cx">
</span><span class="cx"> GstAppSinkCallbacks callbacks;
</span><del>- callbacks.eos = 0;
- callbacks.new_preroll = 0;
</del><ins>+ callbacks.eos = nullptr;
+ callbacks.new_preroll = nullptr;
</ins><span class="cx"> callbacks.new_sample = onAppsinkNewBufferCallback;
</span><del>- gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);
</del><ins>+ gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, nullptr);
</ins><span class="cx">
</span><span class="cx"> g_object_set(sink, "async", FALSE, nullptr);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -184,14 +184,14 @@
</span><span class="cx"> src->priv = priv;
</span><span class="cx"> new (priv) WebKitWebAudioSourcePrivate();
</span><span class="cx">
</span><del>- priv->sourcePad = webkitGstGhostPadFromStaticTemplate(&srcTemplate, "src", 0);
</del><ins>+ priv->sourcePad = webkitGstGhostPadFromStaticTemplate(&srcTemplate, "src", nullptr);
</ins><span class="cx"> gst_element_add_pad(GST_ELEMENT(src), priv->sourcePad);
</span><span class="cx">
</span><del>- priv->provider = 0;
- priv->bus = 0;
</del><ins>+ priv->provider = nullptr;
+ priv->bus = nullptr;
</ins><span class="cx">
</span><span class="cx"> g_rec_mutex_init(&priv->mutex);
</span><del>- priv->task = adoptGRef(gst_task_new(reinterpret_cast<GstTaskFunction>(webKitWebAudioSrcLoop), src, 0));
</del><ins>+ priv->task = adoptGRef(gst_task_new(reinterpret_cast<GstTaskFunction>(webKitWebAudioSrcLoop), src, nullptr));
</ins><span class="cx">
</span><span class="cx"> gst_task_set_lock(priv->task.get(), &priv->mutex);
</span><span class="cx"> }
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for local/live audio input.
</span><del>- priv->provider->render(0, priv->bus, priv->framesToPull);
</del><ins>+ priv->provider->render(nullptr, priv->bus, priv->framesToPull);
</ins><span class="cx">
</span><span class="cx"> ASSERT(channelBufferList.size() == priv->sources.size());
</span><span class="cx"> bool failed = false;
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> case GST_STATE_CHANGE_NULL_TO_READY:
</span><span class="cx"> if (!src->priv->interleave) {
</span><span class="cx"> gst_element_post_message(element, gst_missing_element_message_new(element, "interleave"));
</span><del>- GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (0), ("no interleave"));
</del><ins>+ GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave"));
</ins><span class="cx"> return GST_STATE_CHANGE_FAILURE;
</span><span class="cx"> }
</span><span class="cx"> src->priv->numberOfSamples = 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerAudioTrackPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> AudioTrackPrivate::setEnabled(enabled);
</span><span class="cx">
</span><span class="cx"> if (enabled && m_playbin)
</span><del>- g_object_set(m_playbin.get(), "current-audio", m_index, NULL);
</del><ins>+ g_object_set(m_playbin.get(), "current-audio", m_index, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><span class="cx"> // FIXME: We should probably pass the arguments from the command line.
</span><del>- bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
</del><ins>+ bool gstInitialized = gst_init_check(nullptr, nullptr, &error.outPtr());
</ins><span class="cx"> ASSERT_WITH_MESSAGE(gstInitialized, "GStreamer initialization failed: %s", error ? error->message : "unknown error occurred");
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -96,8 +96,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const char* role = m_player->client().mediaPlayerIsVideo() ? "video" : "music";
</span><del>- GstStructure* structure = gst_structure_new("stream-properties", "media.role", G_TYPE_STRING, role, NULL);
- g_object_set(object, "stream-properties", structure, NULL);
</del><ins>+ GstStructure* structure = gst_structure_new("stream-properties", "media.role", G_TYPE_STRING, role, nullptr);
+ g_object_set(object, "stream-properties", structure, nullptr);
</ins><span class="cx"> gst_structure_free(structure);
</span><span class="cx"> GUniquePtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(object)));
</span><span class="cx"> GST_DEBUG("Set media.role as %s at %s", role, elementName.get());
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isAvailable())
</span><span class="cx"> registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateGStreamer>(player); },
</span><del>- getSupportedTypes, supportsType, 0, 0, 0, supportsKeySystem);
</del><ins>+ getSupportedTypes, supportsType, nullptr, nullptr, nullptr, supportsKeySystem);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool initializeGStreamerAndRegisterWebKitElements()
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> GRefPtr<GstElementFactory> srcFactory = adoptGRef(gst_element_factory_find("webkitwebsrc"));
</span><span class="cx"> if (!srcFactory) {
</span><span class="cx"> GST_DEBUG_CATEGORY_INIT(webkit_media_player_debug, "webkitmediaplayer", 0, "WebKit media player");
</span><del>- gst_element_register(0, "webkitwebsrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEB_SRC);
</del><ins>+ gst_element_register(nullptr, "webkitwebsrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEB_SRC);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -153,10 +153,10 @@
</span><span class="cx"> , m_seeking(false)
</span><span class="cx"> , m_seekIsPending(false)
</span><span class="cx"> , m_seekTime(0)
</span><del>- , m_source(0)
</del><ins>+ , m_source(nullptr)
</ins><span class="cx"> , m_volumeAndMuteInitialized(false)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><del>- , m_mediaLocations(0)
</del><ins>+ , m_mediaLocations(nullptr)
</ins><span class="cx"> , m_mediaLocationCurrentIndex(0)
</span><span class="cx"> , m_playbackRatePause(false)
</span><span class="cx"> , m_timeOfOverlappingSeek(-1)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_mediaLocations) {
</span><span class="cx"> gst_structure_free(m_mediaLocations);
</span><del>- m_mediaLocations = 0;
</del><ins>+ m_mediaLocations = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (WEBKIT_IS_WEB_SRC(m_source.get()) && GST_OBJECT_PARENT(m_source.get()))
</span><span class="lines">@@ -796,7 +796,7 @@
</span><span class="cx"> gst_pad_get_sticky_event(m_textAppSinkPad.get(), GST_EVENT_STREAM_START, 0));
</span><span class="cx">
</span><span class="cx"> GRefPtr<GstSample> sample;
</span><del>- g_signal_emit_by_name(m_textAppSink.get(), "pull-sample", &sample.outPtr(), NULL);
</del><ins>+ g_signal_emit_by_name(m_textAppSink.get(), "pull-sample", &sample.outPtr(), nullptr);
</ins><span class="cx"> ASSERT(sample);
</span><span class="cx">
</span><span class="cx"> if (streamStartEvent) {
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx">
</span><span class="cx"> // Construct a filename for the graphviz dot file output.
</span><span class="cx"> GstState newState;
</span><del>- gst_message_parse_state_changed(message, &currentState, &newState, 0);
</del><ins>+ gst_message_parse_state_changed(message, &currentState, &newState, nullptr);
</ins><span class="cx"> CString dotFileName = String::format("webkit-video.%s_%s", gst_element_state_get_name(currentState), gst_element_state_get_name(newState)).utf8();
</span><span class="cx"> GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(GST_BIN(m_pipeline.get()), GST_DEBUG_GRAPH_SHOW_ALL, dotFileName.data());
</span><span class="cx">
</span><span class="lines">@@ -1173,12 +1173,11 @@
</span><span class="cx"> ASSERT(toc);
</span><span class="cx">
</span><span class="cx"> for (GList* i = gst_toc_get_entries(toc.get()); i; i = i->next)
</span><del>- processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data), 0);
</del><ins>+ processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::processTableOfContentsEntry(GstTocEntry* entry, GstTocEntry* parent)
</del><ins>+void MediaPlayerPrivateGStreamer::processTableOfContentsEntry(GstTocEntry* entry)
</ins><span class="cx"> {
</span><del>- UNUSED_PARAM(parent);
</del><span class="cx"> ASSERT(entry);
</span><span class="cx">
</span><span class="cx"> RefPtr<GenericCueData> cue = GenericCueData::create();
</span><span class="lines">@@ -1192,7 +1191,7 @@
</span><span class="cx">
</span><span class="cx"> GstTagList* tags = gst_toc_entry_get_tags(entry);
</span><span class="cx"> if (tags) {
</span><del>- gchar* title = 0;
</del><ins>+ gchar* title = nullptr;
</ins><span class="cx"> gst_tag_list_get_string(tags, GST_TAG_TITLE, &title);
</span><span class="cx"> if (title) {
</span><span class="cx"> cue->setContent(title);
</span><span class="lines">@@ -1203,7 +1202,7 @@
</span><span class="cx"> m_chaptersTrack->addGenericCue(cue.release());
</span><span class="cx">
</span><span class="cx"> for (GList* i = gst_toc_entry_get_sub_entries(entry); i; i = i->next)
</span><del>- processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data), entry);
</del><ins>+ processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1219,7 +1218,7 @@
</span><span class="cx"> gint64 start, stop;
</span><span class="cx"> gdouble fillStatus = 100.0;
</span><span class="cx">
</span><del>- gst_query_parse_buffering_range(query, 0, &start, &stop, 0);
</del><ins>+ gst_query_parse_buffering_range(query, nullptr, &start, &stop, nullptr);
</ins><span class="cx"> gst_query_unref(query);
</span><span class="cx">
</span><span class="cx"> if (stop != -1)
</span><span class="lines">@@ -1654,7 +1653,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> const GValue* locations = gst_structure_get_value(m_mediaLocations, "locations");
</span><del>- const gchar* newLocation = 0;
</del><ins>+ const gchar* newLocation = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!locations) {
</span><span class="cx"> // Fallback on new-location string.
</span><span class="lines">@@ -1665,7 +1664,7 @@
</span><span class="cx">
</span><span class="cx"> if (!newLocation) {
</span><span class="cx"> if (m_mediaLocationCurrentIndex < 0) {
</span><del>- m_mediaLocations = 0;
</del><ins>+ m_mediaLocations = nullptr;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1974,7 +1973,7 @@
</span><span class="cx">
</span><span class="cx"> GstElement* MediaPlayerPrivateGStreamer::createAudioSink()
</span><span class="cx"> {
</span><del>- m_autoAudioSink = gst_element_factory_make("autoaudiosink", 0);
</del><ins>+ m_autoAudioSink = gst_element_factory_make("autoaudiosink", nullptr);
</ins><span class="cx"> if (!m_autoAudioSink) {
</span><span class="cx"> GST_WARNING("GStreamer's autoaudiosink not found. Please check your gst-plugins-good installation");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -2115,7 +2114,7 @@
</span><span class="cx"> // See https://bugzilla.gnome.org/show_bug.cgi?id=735748 for
</span><span class="cx"> // the reason for using >= 1.4.2 instead of >= 1.4.0.
</span><span class="cx"> if (m_preservesPitch && webkitGstCheckVersion(1, 4, 2)) {
</span><del>- GstElement* scale = gst_element_factory_make("scaletempo", 0);
</del><ins>+ GstElement* scale = gst_element_factory_make("scaletempo", nullptr);
</ins><span class="cx">
</span><span class="cx"> if (!scale)
</span><span class="cx"> GST_WARNING("Failed to create scaletempo");
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void processTableOfContents(GstMessage*);
</span><del>- void processTableOfContentsEntry(GstTocEntry*, GstTocEntry* parent);
</del><ins>+ void processTableOfContentsEntry(GstTocEntry*);
</ins><span class="cx"> #endif
</span><span class="cx"> virtual bool doSeek(gint64 position, float rate, GstSeekFlags seekType);
</span><span class="cx"> virtual void updatePlaybackRate();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase(MediaPlayer* player)
</span><span class="cx"> : m_player(player)
</span><del>- , m_fpsSink(0)
</del><ins>+ , m_fpsSink(nullptr)
</ins><span class="cx"> , m_readyState(MediaPlayer::HaveNothing)
</span><span class="cx"> , m_networkState(MediaPlayer::Empty)
</span><span class="cx"> #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_usingFallbackVideoSink(false)
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><del>- , m_cdmSession(0)
</del><ins>+ , m_cdmSession(nullptr)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> g_mutex_init(&m_sampleMutex);
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> if (!m_volumeElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- g_object_set(m_volumeElement.get(), "mute", muted, NULL);
</del><ins>+ g_object_set(m_volumeElement.get(), "mute", muted, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateGStreamerBase::muted() const
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool muted;
</span><del>- g_object_get(m_volumeElement.get(), "mute", &muted, NULL);
</del><ins>+ g_object_get(m_volumeElement.get(), "mute", &muted, nullptr);
</ins><span class="cx"> return muted;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> gboolean muted;
</span><del>- g_object_get(m_volumeElement.get(), "mute", &muted, NULL);
</del><ins>+ g_object_get(m_volumeElement.get(), "mute", &muted, nullptr);
</ins><span class="cx"> m_player->muteChanged(static_cast<bool>(muted));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1179,12 +1179,12 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=118974 for more information.
</span><span class="cx"> if (!m_player->platformVolumeConfigurationRequired()) {
</span><span class="cx"> GST_DEBUG("Setting stream volume to %f", m_player->volume());
</span><del>- g_object_set(m_volumeElement.get(), "volume", m_player->volume(), NULL);
</del><ins>+ g_object_set(m_volumeElement.get(), "volume", m_player->volume(), nullptr);
</ins><span class="cx"> } else
</span><span class="cx"> GST_DEBUG("Not setting stream volume, trusting system one");
</span><span class="cx">
</span><span class="cx"> GST_DEBUG("Setting stream muted %d", m_player->muted());
</span><del>- g_object_set(m_volumeElement.get(), "mute", m_player->muted(), NULL);
</del><ins>+ g_object_set(m_volumeElement.get(), "mute", m_player->muted(), nullptr);
</ins><span class="cx">
</span><span class="cx"> g_signal_connect_swapped(m_volumeElement.get(), "notify::volume", G_CALLBACK(volumeChangedCallback), this);
</span><span class="cx"> g_signal_connect_swapped(m_volumeElement.get(), "notify::mute", G_CALLBACK(muteChangedCallback), this);
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx"> {
</span><span class="cx"> guint64 decodedFrames = 0;
</span><span class="cx"> if (m_fpsSink)
</span><del>- g_object_get(m_fpsSink.get(), "frames-rendered", &decodedFrames, NULL);
</del><ins>+ g_object_get(m_fpsSink.get(), "frames-rendered", &decodedFrames, nullptr);
</ins><span class="cx"> return static_cast<unsigned>(decodedFrames);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx"> {
</span><span class="cx"> guint64 framesDropped = 0;
</span><span class="cx"> if (m_fpsSink)
</span><del>- g_object_get(m_fpsSink.get(), "frames-dropped", &framesDropped, NULL);
</del><ins>+ g_object_get(m_fpsSink.get(), "frames-dropped", &framesDropped, nullptr);
</ins><span class="cx"> return static_cast<unsigned>(framesDropped);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> if (initializeGStreamerAndGStreamerDebugging()) {
</span><span class="cx"> registrar([](MediaPlayer* player) {
</span><span class="cx"> return std::make_unique<MediaPlayerPrivateGStreamerOwr>(player);
</span><del>- }, getSupportedTypes, supportsType, 0, 0, 0, 0);
</del><ins>+ }, getSupportedTypes, supportsType, nullptr, nullptr, nullptr, nullptr);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTextCombinerGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_text_combiner_init(WebKitTextCombiner* combiner)
</span><span class="cx"> {
</span><del>- combiner->funnel = gst_element_factory_make("funnel", NULL);
</del><ins>+ combiner->funnel = gst_element_factory_make("funnel", nullptr);
</ins><span class="cx"> ASSERT(combiner->funnel);
</span><span class="cx">
</span><span class="cx"> gboolean ret = gst_bin_add(GST_BIN(combiner), combiner->funnel);
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> * the funnel */
</span><span class="cx"> if (targetParent == combiner->funnel) {
</span><span class="cx"> /* Setup a WebVTT encoder */
</span><del>- GstElement* encoder = gst_element_factory_make("webvttenc", NULL);
</del><ins>+ GstElement* encoder = gst_element_factory_make("webvttenc", nullptr);
</ins><span class="cx"> ASSERT(encoder);
</span><span class="cx">
</span><span class="cx"> ret = gst_bin_add(GST_BIN(combiner), encoder);
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> GstPad* pad = gst_element_request_pad(combiner->funnel, templ, name, caps);
</span><span class="cx"> ASSERT(pad);
</span><span class="cx">
</span><del>- GstPad* ghostPad = GST_PAD(g_object_new(WEBKIT_TYPE_TEXT_COMBINER_PAD, "direction", gst_pad_get_direction(pad), NULL));
</del><ins>+ GstPad* ghostPad = GST_PAD(g_object_new(WEBKIT_TYPE_TEXT_COMBINER_PAD, "direction", gst_pad_get_direction(pad), nullptr));
</ins><span class="cx"> ASSERT(ghostPad);
</span><span class="cx">
</span><span class="cx"> ret = gst_ghost_pad_construct(GST_GHOST_PAD(ghostPad));
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> GstElement* webkitTextCombinerNew()
</span><span class="cx"> {
</span><del>- return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_COMBINER, 0));
</del><ins>+ return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_COMBINER, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTextSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> GstElement* webkitTextSinkNew()
</span><span class="cx"> {
</span><del>- return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_SINK, 0));
</del><ins>+ return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_SINK, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GstTagList> tags;
</span><span class="cx"> if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_pad.get()), "tags"))
</span><del>- g_object_get(m_pad.get(), "tags", &tags.outPtr(), NULL);
</del><ins>+ g_object_get(m_pad.get(), "tags", &tags.outPtr(), nullptr);
</ins><span class="cx"> else
</span><span class="cx"> tags = adoptGRef(gst_tag_list_new_empty());
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> gboolean active = false;
</span><span class="cx"> if (m_pad && g_object_class_find_property(G_OBJECT_GET_CLASS(m_pad.get()), "active"))
</span><del>- g_object_get(m_pad.get(), "active", &active, NULL);
</del><ins>+ g_object_get(m_pad.get(), "active", &active, nullptr);
</ins><span class="cx">
</span><span class="cx"> setActive(active);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> static void webkit_video_sink_init(WebKitVideoSink* sink)
</span><span class="cx"> {
</span><span class="cx"> sink->priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
</span><del>- g_object_set(GST_BASE_SINK(sink), "enable-last-sample", FALSE, NULL);
</del><ins>+ g_object_set(GST_BASE_SINK(sink), "enable-last-sample", FALSE, nullptr);
</ins><span class="cx"> new (sink->priv) WebKitVideoSinkPrivate();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> static gboolean webkitVideoSinkProposeAllocation(GstBaseSink* baseSink, GstQuery* query)
</span><span class="cx"> {
</span><span class="cx"> GstCaps* caps;
</span><del>- gst_query_parse_allocation(query, &caps, 0);
</del><ins>+ gst_query_parse_allocation(query, &caps, nullptr);
</ins><span class="cx"> if (!caps)
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="lines">@@ -349,9 +349,9 @@
</span><span class="cx"> if (!gst_video_info_from_caps(&sink->priv->info, caps))
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, 0);
- gst_query_add_allocation_meta(query, GST_VIDEO_CROP_META_API_TYPE, 0);
- gst_query_add_allocation_meta(query, GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, 0);
</del><ins>+ gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, nullptr);
+ gst_query_add_allocation_meta(query, GST_VIDEO_CROP_META_API_TYPE, nullptr);
+ gst_query_add_allocation_meta(query, GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, nullptr);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx">
</span><span class="cx"> GstElement* webkitVideoSinkNew()
</span><span class="cx"> {
</span><del>- return GST_ELEMENT(g_object_new(WEBKIT_TYPE_VIDEO_SINK, 0));
</del><ins>+ return GST_ELEMENT(g_object_new(WEBKIT_TYPE_VIDEO_SINK, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO) && USE(GSTREAMER)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerVideoTrackPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> VideoTrackPrivate::setSelected(selected);
</span><span class="cx">
</span><span class="cx"> if (selected && m_playbin)
</span><del>- g_object_set(m_playbin.get(), "current-video", m_index, NULL);
</del><ins>+ g_object_set(m_playbin.get(), "current-video", m_index, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> priv->createdInMainThread = isMainThread();
</span><span class="cx">
</span><del>- priv->appsrc = GST_APP_SRC(gst_element_factory_make("appsrc", 0));
</del><ins>+ priv->appsrc = GST_APP_SRC(gst_element_factory_make("appsrc", nullptr));
</ins><span class="cx"> if (!priv->appsrc) {
</span><span class="cx"> GST_ERROR_OBJECT(src, "Failed to create appsrc");
</span><span class="cx"> return;
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> GST_OBJECT_FLAG_SET(priv->srcpad, GST_PAD_FLAG_NEED_PARENT);
</span><span class="cx"> gst_pad_set_query_function(priv->srcpad, webKitWebSrcQueryWithParent);
</span><span class="cx">
</span><del>- gst_app_src_set_callbacks(priv->appsrc, &appsrcCallbacks, src, 0);
</del><ins>+ gst_app_src_set_callbacks(priv->appsrc, &appsrcCallbacks, src, nullptr);
</ins><span class="cx"> gst_app_src_set_emit_signals(priv->appsrc, FALSE);
</span><span class="cx"> gst_app_src_set_stream_type(priv->appsrc, GST_APP_STREAM_TYPE_SEEKABLE);
</span><span class="cx">
</span><span class="lines">@@ -308,9 +308,9 @@
</span><span class="cx"> // likely that libsoup already provides new data before
</span><span class="cx"> // the queue is really empty.
</span><span class="cx"> // This might need tweaking for ports not using libsoup.
</span><del>- g_object_set(priv->appsrc, "min-percent", 20, NULL);
</del><ins>+ g_object_set(priv->appsrc, "min-percent", 20, nullptr);
</ins><span class="cx">
</span><del>- gst_app_src_set_caps(priv->appsrc, 0);
</del><ins>+ gst_app_src_set_caps(priv->appsrc, nullptr);
</ins><span class="cx"> gst_app_src_set_size(priv->appsrc, -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><del>- priv->player = 0;
</del><ins>+ priv->player = nullptr;
</ins><span class="cx">
</span><span class="cx"> GST_CALL_PARENT(G_OBJECT_CLASS, dispose, (object));
</span><span class="cx"> }
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> switch (propID) {
</span><span class="cx"> case PROP_LOCATION:
</span><del>- gst_uri_handler_set_uri(reinterpret_cast<GstURIHandler*>(src), g_value_get_string(value), 0);
</del><ins>+ gst_uri_handler_set_uri(reinterpret_cast<GstURIHandler*>(src), g_value_get_string(value), nullptr);
</ins><span class="cx"> break;
</span><span class="cx"> case PROP_KEEP_ALIVE:
</span><span class="cx"> src->priv->keepAlive = g_value_get_boolean(value);
</span><span class="lines">@@ -433,13 +433,13 @@
</span><span class="cx"> if (!wasSeeking) {
</span><span class="cx"> priv->size = 0;
</span><span class="cx"> priv->requestedOffset = 0;
</span><del>- priv->player = 0;
</del><ins>+ priv->player = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="cx"> if (priv->appsrc) {
</span><del>- gst_app_src_set_caps(priv->appsrc, 0);
</del><ins>+ gst_app_src_set_caps(priv->appsrc, nullptr);
</ins><span class="cx"> if (!wasSeeking)
</span><span class="cx"> gst_app_src_set_size(priv->appsrc, -1);
</span><span class="cx"> }
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> if (!priv->appsrc) {
</span><span class="cx"> gst_element_post_message(element,
</span><span class="cx"> gst_missing_element_message_new(element, "appsrc"));
</span><del>- GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (0), ("no appsrc"));
</del><ins>+ GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no appsrc"));
</ins><span class="cx"> return GST_STATE_CHANGE_FAILURE;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> case GST_QUERY_DURATION: {
</span><span class="cx"> GstFormat format;
</span><span class="cx">
</span><del>- gst_query_parse_duration(query, &format, NULL);
</del><ins>+ gst_query_parse_duration(query, &format, nullptr);
</ins><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx">
</span><span class="cx"> const gchar* const* webKitWebSrcGetProtocols(GType)
</span><span class="cx"> {
</span><del>- static const char* protocols[] = {"http", "https", "blob", 0 };
</del><ins>+ static const char* protocols[] = {"http", "https", "blob", nullptr };
</ins><span class="cx"> return protocols;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx"> } else
</span><span class="cx"> gst_app_src_set_size(priv->appsrc, -1);
</span><span class="cx">
</span><del>- gst_app_src_set_caps(priv->appsrc, 0);
</del><ins>+ gst_app_src_set_caps(priv->appsrc, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StreamingClient::handleDataReceived(const char* data, int length)
</span><span class="lines">@@ -1003,7 +1003,7 @@
</span><span class="cx">
</span><span class="cx"> GstFlowReturn ret = gst_app_src_push_buffer(priv->appsrc, priv->buffer.leakRef());
</span><span class="cx"> if (ret != GST_FLOW_OK && ret != GST_FLOW_EOS)
</span><del>- GST_ELEMENT_ERROR(src, CORE, FAILED, (0), (0));
</del><ins>+ GST_ELEMENT_ERROR(src, CORE, FAILED, (nullptr), (nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StreamingClient::handleNotifyFinished()
</span><span class="lines">@@ -1182,7 +1182,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
</span><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Have failure: %s", error.localizedDescription().utf8().data());
</span><del>- GST_ELEMENT_ERROR(src, RESOURCE, FAILED, ("%s", error.localizedDescription().utf8().data()), (0));
</del><ins>+ GST_ELEMENT_ERROR(src, RESOURCE, FAILED, ("%s", error.localizedDescription().utf8().data()), (nullptr));
</ins><span class="cx"> gst_app_src_end_of_stream(src->priv->appsrc);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1197,7 +1197,7 @@
</span><span class="cx"> uri.reset(g_strdup(src->priv->originalURI.data()));
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><del>- GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Access to \"%s\" was blocked", uri.get()), (0));
</del><ins>+ GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Access to \"%s\" was blocked", uri.get()), (nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
</span><span class="lines">@@ -1211,7 +1211,7 @@
</span><span class="cx"> uri.reset(g_strdup(src->priv->originalURI.data()));
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><del>- GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Can't show \"%s\"", uri.get()), (0));
</del><ins>+ GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Can't show \"%s\"", uri.get()), (nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(GSTREAMER)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicsgstreamermseWebKitMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp (213812 => 213813)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp 2017-03-13 10:41:21 UTC (rev 213813)
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> const gchar* const* webKitMediaSrcGetProtocols(GType)
</span><span class="cx"> {
</span><del>- static const char* protocols[] = {"mediasourceblob", 0 };
</del><ins>+ static const char* protocols[] = {"mediasourceblob", nullptr };
</ins><span class="cx"> return protocols;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>