bug 1179662 rename AudioNode::Stream() to GetStream() as it may return null r=padenot

--HG--
extra : rebase_source : 0279287801ec91efd16fa14135812307926b3c68
This commit is contained in:
Karl Tomlinson 2015-07-02 17:30:36 +12:00
Родитель 7f8f4121f7
Коммит ed5b0e90c4
5 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@ -779,7 +779,7 @@ MediaRecorder::MediaRecorder(AudioNode& aSrcAudioNode,
mPipeStream = ctx->Graph()->CreateAudioNodeStream(engine,
MediaStreamGraph::EXTERNAL_STREAM,
ctx->SampleRate());
mInputPort = mPipeStream->AllocateInputPort(aSrcAudioNode.Stream(),
mInputPort = mPipeStream->AllocateInputPort(aSrcAudioNode.GetStream(),
MediaInputPort::FLAG_BLOCK_INPUT,
0,
aSrcOutput);
@ -1140,7 +1140,7 @@ MediaRecorder::GetSourceMediaStream()
return mDOMStream->GetStream();
}
MOZ_ASSERT(mAudioNode != nullptr);
return mPipeStream != nullptr ? mPipeStream.get() : mAudioNode->Stream();
return mPipeStream ? mPipeStream.get() : mAudioNode->GetStream();
}
nsIPrincipal*

Просмотреть файл

@ -51,6 +51,9 @@ public:
virtual void SetChannelCount(uint32_t aChannelCount,
ErrorResult& aRv) override;
// Returns the stream or null after unlink.
AudioNodeStream* Stream() { return mStream; }
void Mute();
void Unmute();

Просмотреть файл

@ -167,7 +167,8 @@ public:
uint32_t mOutputPort;
};
AudioNodeStream* Stream() { return mStream; }
// Returns the stream, if any.
AudioNodeStream* GetStream() { return mStream; }
const nsTArray<InputNode>& InputNodes() const
{

Просмотреть файл

@ -113,7 +113,7 @@ AudioParam::Stream()
mStream = stream.forget();
// Setup the AudioParam's stream as an input to the owner AudioNode's stream
MediaStream* nodeStream = mNode->Stream();
MediaStream* nodeStream = mNode->GetStream();
MOZ_ASSERT(nodeStream->AsProcessedStream());
ProcessedMediaStream* ps = static_cast<ProcessedMediaStream*>(nodeStream);
mNodeStreamPort = ps->AllocateInputPort(mStream, MediaInputPort::FLAG_BLOCK_INPUT);

Просмотреть файл

@ -543,7 +543,7 @@ PannerNode::FindConnectedSources(AudioNode* aNode,
// Check if this node is an AudioBufferSourceNode that still have a stream,
// which means it has not finished playing.
AudioBufferSourceNode* node = inputNodes[i].mInputNode->AsAudioBufferSourceNode();
if (node && node->Stream()) {
if (node && node->GetStream()) {
aSources.AppendElement(node);
}
}