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

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

Issue 1023113002: Web Audio: Change the argument of AudioNode::addOutput(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 29 matching lines...) Expand all
40 40
41 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider) 41 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* context, Me diaStream* mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider)
42 : AudioSourceNode(NodeTypeMediaStreamAudioSource, context, context->sampleRa te()) 42 : AudioSourceNode(NodeTypeMediaStreamAudioSource, context, context->sampleRa te())
43 , m_mediaStream(mediaStream) 43 , m_mediaStream(mediaStream)
44 , m_audioTrack(audioTrack) 44 , m_audioTrack(audioTrack)
45 , m_audioSourceProvider(audioSourceProvider) 45 , m_audioSourceProvider(audioSourceProvider)
46 , m_sourceNumberOfChannels(0) 46 , m_sourceNumberOfChannels(0)
47 { 47 {
48 // Default to stereo. This could change depending on the format of the 48 // Default to stereo. This could change depending on the format of the
49 // MediaStream's audio track. 49 // MediaStream's audio track.
50 addOutput(AudioNodeOutput::create(this, 2)); 50 addOutput(2);
51 51
52 initialize(); 52 initialize();
53 } 53 }
54 54
55 MediaStreamAudioSourceNode::~MediaStreamAudioSourceNode() 55 MediaStreamAudioSourceNode::~MediaStreamAudioSourceNode()
56 { 56 {
57 ASSERT(!isInitialized()); 57 ASSERT(!isInitialized());
58 } 58 }
59 59
60 void MediaStreamAudioSourceNode::dispose() 60 void MediaStreamAudioSourceNode::dispose()
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 { 119 {
120 visitor->trace(m_mediaStream); 120 visitor->trace(m_mediaStream);
121 visitor->trace(m_audioTrack); 121 visitor->trace(m_audioTrack);
122 AudioSourceNode::trace(visitor); 122 AudioSourceNode::trace(visitor);
123 AudioSourceProviderClient::trace(visitor); 123 AudioSourceProviderClient::trace(visitor);
124 } 124 }
125 125
126 } // namespace blink 126 } // namespace blink
127 127
128 #endif // ENABLE(WEB_AUDIO) 128 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/MediaElementAudioSourceNode.cpp ('k') | Source/modules/webaudio/OscillatorNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698