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

Side by Side Diff: media/audio/audio_manager_base.cc

Issue 23475037: Implement GetAudioOutputDevices for remaining platforms, consolidate tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Merge LKGR, remove anonymous namespaces. Created 7 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
« no previous file with comments | « media/audio/audio_input_device_unittest.cc ('k') | media/audio/audio_manager_unittest.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/audio_manager_base.h" 5 #include "media/audio/audio_manager_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 void AudioManagerBase::ShowAudioInputSettings() { 304 void AudioManagerBase::ShowAudioInputSettings() {
305 } 305 }
306 306
307 void AudioManagerBase::GetAudioInputDeviceNames( 307 void AudioManagerBase::GetAudioInputDeviceNames(
308 AudioDeviceNames* device_names) { 308 AudioDeviceNames* device_names) {
309 } 309 }
310 310
311 void AudioManagerBase::GetAudioOutputDeviceNames( 311 void AudioManagerBase::GetAudioOutputDeviceNames(
312 AudioDeviceNames* device_names) { 312 AudioDeviceNames* device_names) {
313 // TODO(joi): Remove this and keep pure virtual once implemented everywhere.
314 NOTREACHED() << "Don't use this yet, it's not ready on all platforms!";
315 } 313 }
316 314
317 void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) { 315 void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) {
318 DCHECK(stream); 316 DCHECK(stream);
319 // TODO(xians) : Have a clearer destruction path for the AudioOutputStream. 317 // TODO(xians) : Have a clearer destruction path for the AudioOutputStream.
320 // For example, pass the ownership to AudioManager so it can delete the 318 // For example, pass the ownership to AudioManager so it can delete the
321 // streams. 319 // streams.
322 --num_output_streams_; 320 --num_output_streams_;
323 delete stream; 321 delete stream;
324 } 322 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 NOTIMPLEMENTED(); 416 NOTIMPLEMENTED();
419 return ""; 417 return "";
420 } 418 }
421 419
422 std::string AudioManagerBase::GetDefaultOutputDeviceID() { 420 std::string AudioManagerBase::GetDefaultOutputDeviceID() {
423 NOTIMPLEMENTED(); 421 NOTIMPLEMENTED();
424 return ""; 422 return "";
425 } 423 }
426 424
427 } // namespace media 425 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_input_device_unittest.cc ('k') | media/audio/audio_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698