Source/modules/webaudio/MediaStreamAudioSourceNode.h - Issue 604753003: Removing #ifdefs for WEB_AUDIO compile time flag.

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

Issue 604753003: Removing #ifdefs for WEB_AUDIO compile time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 2 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

« Source/modules/webaudio/MediaStreamAudioDestinationNode.h ('K') | « Source/modules/webaudio/MediaStreamAudioDestinationNode.idl ('k') | Source/modules/webaudio/MediaStreamAudioSourceNode.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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

11 * documentation and/or other materials provided with the distribution.	11 * documentation and/or other materials provided with the distribution.

12 *	12 *

13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y	13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y

14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y	16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y

17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N	19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N

20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

23 */	23 */

24	24

25 #ifndef MediaStreamAudioSourceNode_h	25 #ifndef MediaStreamAudioSourceNode_h

26 #define MediaStreamAudioSourceNode_h	26 #define MediaStreamAudioSourceNode_h

27	27

28 #if ENABLE(WEB_AUDIO)

29

30 #include "platform/audio/AudioSourceProvider.h"	28 #include "platform/audio/AudioSourceProvider.h"

31 #include "platform/audio/AudioSourceProviderClient.h"	29 #include "platform/audio/AudioSourceProviderClient.h"

32 #include "modules/mediastream/MediaStream.h"	30 #include "modules/mediastream/MediaStream.h"

33 #include "modules/webaudio/AudioSourceNode.h"	31 #include "modules/webaudio/AudioSourceNode.h"

34 #include "wtf/OwnPtr.h"	32 #include "wtf/OwnPtr.h"

35 #include "wtf/PassRefPtr.h"	33 #include "wtf/PassRefPtr.h"

36 #include "wtf/Threading.h"	34 #include "wtf/Threading.h"

37	35

38 namespace blink {	36 namespace blink {

39	37

(...skipping 30 matching lines...) Expand all Loading...
70 Member<MediaStreamTrack> m_audioTrack;	68 Member<MediaStreamTrack> m_audioTrack;

71 OwnPtr<AudioSourceProvider> m_audioSourceProvider;	69 OwnPtr<AudioSourceProvider> m_audioSourceProvider;

72	70

73 Mutex m_processLock;	71 Mutex m_processLock;

74	72

75 unsigned m_sourceNumberOfChannels;	73 unsigned m_sourceNumberOfChannels;

76 };	74 };

77	75

78 } // namespace blink	76 } // namespace blink

79	77

80 #endif // ENABLE(WEB_AUDIO)

81

82 #endif // MediaStreamAudioSourceNode_h	78 #endif // MediaStreamAudioSourceNode_h

OLD	NEW