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

Side by Side Diff: media/audio/pulse/pulse_output.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « media/audio/mac/audio_manager_mac.cc ('k') | media/audio/win/audio_low_latency_output_win.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 #include "media/audio/pulse/pulse_output.h" 5 #include "media/audio/pulse/pulse_output.h"
6 6
7 #include <pulse/pulseaudio.h> 7 #include <pulse/pulseaudio.h>
8 8
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "media/audio/audio_manager_base.h" 10 #include "media/audio/audio_manager_base.h"
11 #include "media/audio/audio_parameters.h"
12 #include "media/audio/pulse/pulse_util.h" 11 #include "media/audio/pulse/pulse_util.h"
13 12
14 namespace media { 13 namespace media {
15 14
16 using pulse::AutoPulseLock; 15 using pulse::AutoPulseLock;
17 using pulse::WaitForOperationCompletion; 16 using pulse::WaitForOperationCompletion;
18 17
19 // static, pa_stream_notify_cb 18 // static, pa_stream_notify_cb
20 void PulseAudioOutputStream::StreamNotifyCallback(pa_stream* s, void* p_this) { 19 void PulseAudioOutputStream::StreamNotifyCallback(pa_stream* s, void* p_this) {
21 PulseAudioOutputStream* stream = static_cast<PulseAudioOutputStream*>(p_this); 20 PulseAudioOutputStream* stream = static_cast<PulseAudioOutputStream*>(p_this);
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 volume_ = static_cast<float>(volume); 227 volume_ = static_cast<float>(volume);
229 } 228 }
230 229
231 void PulseAudioOutputStream::GetVolume(double* volume) { 230 void PulseAudioOutputStream::GetVolume(double* volume) {
232 DCHECK(thread_checker_.CalledOnValidThread()); 231 DCHECK(thread_checker_.CalledOnValidThread());
233 232
234 *volume = volume_; 233 *volume = volume_;
235 } 234 }
236 235
237 } // namespace media 236 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/mac/audio_manager_mac.cc ('k') | media/audio/win/audio_low_latency_output_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698