From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../WebCore/Modules/webaudio/ChannelMergerNode.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'Source/WebCore/Modules/webaudio/ChannelMergerNode.h') diff --git a/Source/WebCore/Modules/webaudio/ChannelMergerNode.h b/Source/WebCore/Modules/webaudio/ChannelMergerNode.h index 0cc783e45..3071b5605 100644 --- a/Source/WebCore/Modules/webaudio/ChannelMergerNode.h +++ b/Source/WebCore/Modules/webaudio/ChannelMergerNode.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,11 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ChannelMergerNode_h -#define ChannelMergerNode_h +#pragma once #include "AudioNode.h" -#include namespace WebCore { @@ -38,24 +36,22 @@ class AudioContext; class ChannelMergerNode : public AudioNode { public: - static PassRefPtr create(AudioContext*, float sampleRate, unsigned numberOfInputs); + static RefPtr create(AudioContext&, float sampleRate, unsigned numberOfInputs); // AudioNode - virtual void process(size_t framesToProcess) override; - virtual void reset() override; + void process(size_t framesToProcess) override; + void reset() override; // Called in the audio thread (pre-rendering task) when the number of channels for an input may have changed. - virtual void checkNumberOfChannelsForInput(AudioNodeInput*) override; + void checkNumberOfChannelsForInput(AudioNodeInput*) override; private: unsigned m_desiredNumberOfOutputChannels; - virtual double tailTime() const override { return 0; } - virtual double latencyTime() const override { return 0; } + double tailTime() const override { return 0; } + double latencyTime() const override { return 0; } - ChannelMergerNode(AudioContext*, float sampleRate, unsigned numberOfInputs); + ChannelMergerNode(AudioContext&, float sampleRate, unsigned numberOfInputs); }; } // namespace WebCore - -#endif // ChannelMergerNode_h -- cgit v1.2.1