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

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

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « media/audio/point_unittest.cc ('k') | media/audio/pulse/pulse_input.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/audio_manager_pulse.h" 5 #include "media/audio/pulse/audio_manager_pulse.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/nix/xdg_util.h" 11 #include "base/nix/xdg_util.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #if defined(USE_ALSA) 13 #if defined(USE_ALSA)
14 #include "media/audio/alsa/audio_manager_alsa.h" 14 #include "media/audio/alsa/audio_manager_alsa.h"
15 #endif 15 #endif
16 #include "media/audio/audio_parameters.h"
17 #include "media/audio/pulse/pulse_input.h" 16 #include "media/audio/pulse/pulse_input.h"
18 #include "media/audio/pulse/pulse_output.h" 17 #include "media/audio/pulse/pulse_output.h"
19 #include "media/audio/pulse/pulse_util.h" 18 #include "media/audio/pulse/pulse_util.h"
19 #include "media/base/audio_parameters.h"
20 #include "media/base/channel_layout.h" 20 #include "media/base/channel_layout.h"
21 21
22 #if defined(DLOPEN_PULSEAUDIO) 22 #if defined(DLOPEN_PULSEAUDIO)
23 #include "media/audio/pulse/pulse_stubs.h" 23 #include "media/audio/pulse/pulse_stubs.h"
24 24
25 using media_audio_pulse::kModulePulse; 25 using media_audio_pulse::kModulePulse;
26 using media_audio_pulse::InitializeStubs; 26 using media_audio_pulse::InitializeStubs;
27 using media_audio_pulse::StubPathMap; 27 using media_audio_pulse::StubPathMap;
28 #endif // defined(DLOPEN_PULSEAUDIO) 28 #endif // defined(DLOPEN_PULSEAUDIO)
29 29
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context, 335 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
336 const pa_server_info* info, 336 const pa_server_info* info,
337 void* user_data) { 337 void* user_data) {
338 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data); 338 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
339 339
340 manager->native_input_sample_rate_ = info->sample_spec.rate; 340 manager->native_input_sample_rate_ = info->sample_spec.rate;
341 pa_threaded_mainloop_signal(manager->input_mainloop_, 0); 341 pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
342 } 342 }
343 343
344 } // namespace media 344 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/point_unittest.cc ('k') | media/audio/pulse/pulse_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698