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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/AudioNode.h

Issue 2282483002: Return the correct channelCountMode and channelInterpretation (Closed)
Patch Set: Define setters for the mode and interpretation Created 4 years, 3 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
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 * 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 259
260 volatile int m_connectionRefCount; 260 volatile int m_connectionRefCount;
261 261
262 bool m_isDisabled; 262 bool m_isDisabled;
263 263
264 #if DEBUG_AUDIONODE_REFERENCES 264 #if DEBUG_AUDIONODE_REFERENCES
265 static bool s_isNodeCountInitialized; 265 static bool s_isNodeCountInitialized;
266 static int s_nodeCount[NodeTypeEnd]; 266 static int s_nodeCount[NodeTypeEnd];
267 #endif 267 #endif
268 268
269 protected:
270 unsigned m_channelCount;
271 ChannelCountMode m_channelCountMode; 269 ChannelCountMode m_channelCountMode;
272 AudioBus::ChannelInterpretation m_channelInterpretation; 270 AudioBus::ChannelInterpretation m_channelInterpretation;
271
272 protected:
273 // Set the (internal) channelCountMode and channelInterpretation
274 // accordingly. Use this in the node constructors to set the internal state
275 // correctly if the node uses values different from the defaults.
276 void setInternalChannelCountMode(ChannelCountMode);
277 void setInternalChannelInterpretation(AudioBus::ChannelInterpretation);
278
279 unsigned m_channelCount;
273 // The new channel count mode that will be used to set the actual mode in th e pre or post 280 // The new channel count mode that will be used to set the actual mode in th e pre or post
274 // rendering phase. 281 // rendering phase.
275 ChannelCountMode m_newChannelCountMode; 282 ChannelCountMode m_newChannelCountMode;
276 // The new channel interpretation that will be used to set the actual 283 // The new channel interpretation that will be used to set the actual
277 // intepretation in the pre or post rendering phase. 284 // intepretation in the pre or post rendering phase.
278 AudioBus::ChannelInterpretation m_newChannelInterpretation; 285 AudioBus::ChannelInterpretation m_newChannelInterpretation;
279 286
280 }; 287 };
281 288
282 class MODULES_EXPORT AudioNode : public EventTargetWithInlineData { 289 class MODULES_EXPORT AudioNode : public EventTargetWithInlineData {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 HeapVector<Member<HeapHashSet<Member<AudioNode>>>> m_connectedNodes; 343 HeapVector<Member<HeapHashSet<Member<AudioNode>>>> m_connectedNodes;
337 // Represents audio node graph with Oilpan references. N-th HeapHashSet 344 // Represents audio node graph with Oilpan references. N-th HeapHashSet
338 // represents a set of AudioParam objects connected to this AudioNode's N-th 345 // represents a set of AudioParam objects connected to this AudioNode's N-th
339 // output. 346 // output.
340 HeapVector<Member<HeapHashSet<Member<AudioParam>>>> m_connectedParams; 347 HeapVector<Member<HeapHashSet<Member<AudioParam>>>> m_connectedParams;
341 }; 348 };
342 349
343 } // namespace blink 350 } // namespace blink
344 351
345 #endif // AudioNode_h 352 #endif // AudioNode_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698