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

Side by Side Diff: media/audio/audio_output_mixer.h

Issue 10855086: Disable AudioOutputMixer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // AudioOutputMixer is a class that implements browser-side audio mixer. 5 // AudioOutputMixer is a class that implements browser-side audio mixer.
6 // AudioOutputMixer implements both AudioOutputDispatcher and 6 // AudioOutputMixer implements both AudioOutputDispatcher and
7 // AudioSourceCallback interfaces. 7 // AudioSourceCallback interfaces.
8 8
9 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_ 9 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_
10 #define MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_ 10 #define MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_
(...skipping 25 matching lines...) Expand all
36 virtual bool OpenStream() OVERRIDE; 36 virtual bool OpenStream() OVERRIDE;
37 virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, 37 virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
38 AudioOutputProxy* stream_proxy) OVERRIDE; 38 AudioOutputProxy* stream_proxy) OVERRIDE;
39 virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE; 39 virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE;
40 virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, 40 virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy,
41 double volume) OVERRIDE; 41 double volume) OVERRIDE;
42 virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE; 42 virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE;
43 virtual void Shutdown() OVERRIDE; 43 virtual void Shutdown() OVERRIDE;
44 44
45 // AudioSourceCallback interface. 45 // AudioSourceCallback interface.
46 virtual uint32 OnMoreData(uint8* dest, 46 virtual uint32 OnMoreData(AudioBus* audio_bus,
scherkus (not reviewing) 2012/08/09 22:12:39 ??
DaleCurtis 2012/08/09 22:46:29 Whoops. Removed.
47 uint32 max_size,
48 AudioBuffersState buffers_state) OVERRIDE; 47 AudioBuffersState buffers_state) OVERRIDE;
49 virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE; 48 virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
50 virtual void WaitTillDataReady() OVERRIDE; 49 virtual void WaitTillDataReady() OVERRIDE;
51 50
52 private: 51 private:
53 friend class base::RefCountedThreadSafe<AudioOutputMixer>; 52 friend class base::RefCountedThreadSafe<AudioOutputMixer>;
54 virtual ~AudioOutputMixer(); 53 virtual ~AudioOutputMixer();
55 54
56 // Called by |close_timer_|. Closes physical stream. 55 // Called by |close_timer_|. Closes physical stream.
57 void ClosePhysicalStream(); 56 void ClosePhysicalStream();
(...skipping 27 matching lines...) Expand all
85 84
86 // Size of data in all in-flight buffers. 85 // Size of data in all in-flight buffers.
87 int pending_bytes_; 86 int pending_bytes_;
88 87
89 DISALLOW_COPY_AND_ASSIGN(AudioOutputMixer); 88 DISALLOW_COPY_AND_ASSIGN(AudioOutputMixer);
90 }; 89 };
91 90
92 } // namespace media 91 } // namespace media
93 92
94 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_ 93 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698