Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Side by Side Diff: Source/modules/webaudio/ChannelMergerNode.cpp

Issue 906233002: Use nullptr instead of 0 in WebAudio (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/modules/webaudio/AudioNode.cpp ('k') | Source/modules/webaudio/ChannelSplitterNode.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 25 matching lines...) Expand all
36 #include "modules/webaudio/AudioNodeInput.h" 36 #include "modules/webaudio/AudioNodeInput.h"
37 #include "modules/webaudio/AudioNodeOutput.h" 37 #include "modules/webaudio/AudioNodeOutput.h"
38 38
39 const unsigned DefaultNumberOfOutputChannels = 1; 39 const unsigned DefaultNumberOfOutputChannels = 1;
40 40
41 namespace blink { 41 namespace blink {
42 42
43 ChannelMergerNode* ChannelMergerNode::create(AudioContext* context, float sample Rate, unsigned numberOfInputs) 43 ChannelMergerNode* ChannelMergerNode::create(AudioContext* context, float sample Rate, unsigned numberOfInputs)
44 { 44 {
45 if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels()) 45 if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
46 return 0; 46 return nullptr;
47 47
48 return new ChannelMergerNode(context, sampleRate, numberOfInputs); 48 return new ChannelMergerNode(context, sampleRate, numberOfInputs);
49 } 49 }
50 50
51 ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, un signed numberOfInputs) 51 ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, un signed numberOfInputs)
52 : AudioNode(NodeTypeChannelMerger, context, sampleRate) 52 : AudioNode(NodeTypeChannelMerger, context, sampleRate)
53 , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels) 53 , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels)
54 { 54 {
55 // Create the requested number of inputs. 55 // Create the requested number of inputs.
56 for (unsigned i = 0; i < numberOfInputs; ++i) 56 for (unsigned i = 0; i < numberOfInputs; ++i)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // channels because of tryLocks() in the context's updating system. So recor d the new number of 126 // channels because of tryLocks() in the context's updating system. So recor d the new number of
127 // output channels here. 127 // output channels here.
128 m_desiredNumberOfOutputChannels = numberOfOutputChannels; 128 m_desiredNumberOfOutputChannels = numberOfOutputChannels;
129 129
130 AudioNode::checkNumberOfChannelsForInput(input); 130 AudioNode::checkNumberOfChannelsForInput(input);
131 } 131 }
132 132
133 } // namespace blink 133 } // namespace blink
134 134
135 #endif // ENABLE(WEB_AUDIO) 135 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/AudioNode.cpp ('k') | Source/modules/webaudio/ChannelSplitterNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698