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

Side by Side Diff: content/browser/renderer_host/media/audio_input_renderer_host.cc

Issue 1175003004: Change audio IPC enums from kConstantStyle to MACRO_STYLE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 6 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 | « no previous file | content/browser/renderer_host/media/audio_renderer_host.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 "content/browser/renderer_host/media/audio_input_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/numerics/safe_math.h" 10 #include "base/numerics/safe_math.h"
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 audio_log_->OnSetVolume(stream_id, volume); 462 audio_log_->OnSetVolume(stream_id, volume);
463 } 463 }
464 464
465 void AudioInputRendererHost::SendErrorMessage( 465 void AudioInputRendererHost::SendErrorMessage(
466 int stream_id, ErrorCode error_code) { 466 int stream_id, ErrorCode error_code) {
467 std::string err_msg = 467 std::string err_msg =
468 base::StringPrintf("SendErrorMessage(error_code=%d)", error_code); 468 base::StringPrintf("SendErrorMessage(error_code=%d)", error_code);
469 LogMessage(stream_id, err_msg, true); 469 LogMessage(stream_id, err_msg, true);
470 470
471 Send(new AudioInputMsg_NotifyStreamStateChanged( 471 Send(new AudioInputMsg_NotifyStreamStateChanged(
472 stream_id, media::AudioInputIPCDelegate::kError)); 472 stream_id, media::AUDIO_INPUT_IPC_DELEGATE_STATE_ERROR));
473 } 473 }
474 474
475 void AudioInputRendererHost::DeleteEntries() { 475 void AudioInputRendererHost::DeleteEntries() {
476 DCHECK_CURRENTLY_ON(BrowserThread::IO); 476 DCHECK_CURRENTLY_ON(BrowserThread::IO);
477 477
478 for (AudioEntryMap::iterator i = audio_entries_.begin(); 478 for (AudioEntryMap::iterator i = audio_entries_.begin();
479 i != audio_entries_.end(); ++i) { 479 i != audio_entries_.end(); ++i) {
480 CloseAndDeleteStream(i->second); 480 CloseAndDeleteStream(i->second);
481 } 481 }
482 } 482 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 #if defined(OS_CHROMEOS) 550 #if defined(OS_CHROMEOS)
551 if (config.params.channel_layout() == 551 if (config.params.channel_layout() ==
552 media::CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC) { 552 media::CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC) {
553 media_stream_manager_->audio_input_device_manager() 553 media_stream_manager_->audio_input_device_manager()
554 ->UnregisterKeyboardMicStream(); 554 ->UnregisterKeyboardMicStream();
555 } 555 }
556 #endif 556 #endif
557 } 557 }
558 558
559 } // namespace content 559 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698