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

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

Issue 10184011: Remove unused parameter "stream" from all variants of OnMoreData(). (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_mixer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(AudioOutputStream* stream, 46 virtual uint32 OnMoreData(uint8* dest,
47 uint8* dest,
48 uint32 max_size, 47 uint32 max_size,
49 AudioBuffersState buffers_state) OVERRIDE; 48 AudioBuffersState buffers_state) OVERRIDE;
50 virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE; 49 virtual void OnError(AudioOutputStream* stream, int code) OVERRIDE;
51 virtual void WaitTillDataReady() OVERRIDE; 50 virtual void WaitTillDataReady() OVERRIDE;
52 51
53 private: 52 private:
54 friend class base::RefCountedThreadSafe<AudioOutputMixer>; 53 friend class base::RefCountedThreadSafe<AudioOutputMixer>;
55 virtual ~AudioOutputMixer(); 54 virtual ~AudioOutputMixer();
56 55
57 // Called by |close_timer_|. Closes physical stream. 56 // Called by |close_timer_|. Closes physical stream.
(...skipping 25 matching lines...) Expand all
83 // Used to post delayed tasks to ourselves that we cancel inside Shutdown(). 82 // Used to post delayed tasks to ourselves that we cancel inside Shutdown().
84 base::WeakPtrFactory<AudioOutputMixer> weak_this_; 83 base::WeakPtrFactory<AudioOutputMixer> weak_this_;
85 base::DelayTimer<AudioOutputMixer> close_timer_; 84 base::DelayTimer<AudioOutputMixer> close_timer_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(AudioOutputMixer); 86 DISALLOW_COPY_AND_ASSIGN(AudioOutputMixer);
88 }; 87 };
89 88
90 } // namespace media 89 } // namespace media
91 90
92 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_ 91 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698