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

Side by Side Diff: media/audio/linux/cras_output.h

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Comments. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/linux/alsa_output_unittest.cc ('k') | media/audio/linux/cras_output.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 // Creates an output stream based on the cras (ChromeOS audio server) interface. 5 // Creates an output stream based on the cras (ChromeOS audio server) interface.
6 // 6 //
7 // CrasOutputStream object is *not* thread-safe and should only be used 7 // CrasOutputStream object is *not* thread-safe and should only be used
8 // from the audio thread. 8 // from the audio thread.
9 9
10 #ifndef MEDIA_AUDIO_LINUX_CRAS_OUTPUT_H_ 10 #ifndef MEDIA_AUDIO_LINUX_CRAS_OUTPUT_H_
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 // Volume level from 0.0 to 1.0. 110 // Volume level from 0.0 to 1.0.
111 float volume_; 111 float volume_;
112 112
113 // Audio manager that created us. Used to report that we've been closed. 113 // Audio manager that created us. Used to report that we've been closed.
114 AudioManagerLinux* manager_; 114 AudioManagerLinux* manager_;
115 115
116 // Callback to get audio samples. 116 // Callback to get audio samples.
117 AudioSourceCallback* source_callback_; 117 AudioSourceCallback* source_callback_;
118 118
119 // Container for retrieving data from AudioSourceCallback::OnMoreData().
120 scoped_ptr<AudioBus> audio_bus_;
121
119 DISALLOW_COPY_AND_ASSIGN(CrasOutputStream); 122 DISALLOW_COPY_AND_ASSIGN(CrasOutputStream);
120 }; 123 };
121 124
122 } // namespace media 125 } // namespace media
123 126
124 #endif // MEDIA_AUDIO_LINUX_CRAS_OUTPUT_H_ 127 #endif // MEDIA_AUDIO_LINUX_CRAS_OUTPUT_H_
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_output_unittest.cc ('k') | media/audio/linux/cras_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698