Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/audio/audio_handler.h" | 5 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/singleton.h" | 11 #include "base/memory/singleton.h" |
| 12 #include "chrome/browser/chromeos/audio/audio_mixer_alsa.h" | 12 #include "chrome/browser/chromeos/audio/audio_mixer_alsa.h" |
| 13 #include "chrome/browser/chromeos/system/runtime_environment.h" | |
| 13 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 14 | 15 |
| 15 using std::max; | 16 using std::max; |
| 16 using std::min; | 17 using std::min; |
| 17 | 18 |
| 18 namespace chromeos { | 19 namespace chromeos { |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| 21 | 22 |
| 22 // A value of less than one adjusts quieter volumes in larger steps (giving | 23 // A value of less than one adjusts quieter volumes in larger steps (giving |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 42 } | 43 } |
| 43 } | 44 } |
| 44 | 45 |
| 45 // static | 46 // static |
| 46 AudioHandler* AudioHandler::GetInstance() { | 47 AudioHandler* AudioHandler::GetInstance() { |
| 47 VLOG_IF(1, !g_audio_handler) | 48 VLOG_IF(1, !g_audio_handler) |
| 48 << "AudioHandler::GetInstance() called with NULL global instance."; | 49 << "AudioHandler::GetInstance() called with NULL global instance."; |
| 49 return g_audio_handler; | 50 return g_audio_handler; |
| 50 } | 51 } |
| 51 | 52 |
| 52 bool AudioHandler::IsInitialized() { | 53 bool AudioHandler::IsMixerInitialized() { |
|
xiyuan
2012/01/27 03:30:29
nit: move this to after AudioHandler::~AudioHandle
achuithb
2012/01/27 10:12:46
Done.
| |
| 53 return mixer_->IsInitialized(); | 54 return mixer_->IsInitialized(); |
| 54 } | 55 } |
| 55 | 56 |
| 57 // static | |
| 58 AudioHandler* AudioHandler::GetInstanceIfInitialized() { | |
| 59 return g_audio_handler && g_audio_handler->IsMixerInitialized() ? | |
| 60 g_audio_handler : NULL; | |
| 61 } | |
| 62 | |
| 56 double AudioHandler::GetVolumePercent() { | 63 double AudioHandler::GetVolumePercent() { |
| 57 return VolumeDbToPercent(mixer_->GetVolumeDb()); | 64 return VolumeDbToPercent(mixer_->GetVolumeDb()); |
| 58 } | 65 } |
| 59 | 66 |
| 60 void AudioHandler::SetVolumePercent(double volume_percent) { | 67 void AudioHandler::SetVolumePercent(double volume_percent) { |
| 61 volume_percent = min(max(volume_percent, 0.0), 100.0); | 68 volume_percent = min(max(volume_percent, 0.0), 100.0); |
| 62 mixer_->SetVolumeDb(PercentToVolumeDb(volume_percent)); | 69 mixer_->SetVolumeDb(PercentToVolumeDb(volume_percent)); |
| 70 FOR_EACH_OBSERVER(VolumeObserver, volume_observers_, OnVolumeChanged()); | |
| 63 } | 71 } |
| 64 | 72 |
| 65 void AudioHandler::AdjustVolumeByPercent(double adjust_by_percent) { | 73 void AudioHandler::AdjustVolumeByPercent(double adjust_by_percent) { |
| 66 const double old_volume_db = mixer_->GetVolumeDb(); | 74 const double old_volume_db = mixer_->GetVolumeDb(); |
| 67 const double old_percent = VolumeDbToPercent(old_volume_db); | 75 const double old_percent = VolumeDbToPercent(old_volume_db); |
| 68 SetVolumePercent(old_percent + adjust_by_percent); | 76 SetVolumePercent(old_percent + adjust_by_percent); |
| 69 } | 77 } |
| 70 | 78 |
| 71 bool AudioHandler::IsMuted() { | 79 bool AudioHandler::IsMuted() { |
| 72 return mixer_->IsMuted(); | 80 return mixer_->IsMuted(); |
| 73 } | 81 } |
| 74 | 82 |
| 75 void AudioHandler::SetMuted(bool mute) { | 83 void AudioHandler::SetMuted(bool mute) { |
| 76 mixer_->SetMuted(mute); | 84 mixer_->SetMuted(mute); |
| 85 FOR_EACH_OBSERVER(VolumeObserver, volume_observers_, OnVolumeChanged()); | |
| 77 } | 86 } |
| 78 | 87 |
| 79 AudioHandler::AudioHandler() | 88 AudioHandler::AudioHandler() |
| 80 : mixer_(new AudioMixerAlsa()) { | 89 : mixer_(new AudioMixerAlsa()) { |
| 81 mixer_->Init(); | 90 mixer_->Init(); |
| 82 } | 91 } |
| 83 | 92 |
| 84 AudioHandler::~AudioHandler() { | 93 AudioHandler::~AudioHandler() { |
| 85 mixer_.reset(); | 94 mixer_.reset(); |
| 86 }; | 95 }; |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 106 } | 115 } |
| 107 | 116 |
| 108 double AudioHandler::PercentToVolumeDb(double volume_percent) const { | 117 double AudioHandler::PercentToVolumeDb(double volume_percent) const { |
| 109 double min_volume_db, max_volume_db; | 118 double min_volume_db, max_volume_db; |
| 110 mixer_->GetVolumeLimits(&min_volume_db, &max_volume_db); | 119 mixer_->GetVolumeLimits(&min_volume_db, &max_volume_db); |
| 111 | 120 |
| 112 return pow(volume_percent / 100.0, kVolumeBias) * | 121 return pow(volume_percent / 100.0, kVolumeBias) * |
| 113 (max_volume_db - min_volume_db) + min_volume_db; | 122 (max_volume_db - min_volume_db) + min_volume_db; |
| 114 } | 123 } |
| 115 | 124 |
| 125 void AudioHandler::AddVolumeObserver(VolumeObserver* observer) { | |
| 126 volume_observers_.AddObserver(observer); | |
| 127 } | |
| 128 | |
| 129 void AudioHandler::RemoveVolumeObserver(VolumeObserver* observer) { | |
| 130 volume_observers_.RemoveObserver(observer); | |
| 131 } | |
| 132 | |
| 133 AudioHandler::VolumeObserver::VolumeObserver() { | |
| 134 // AudioHandler should be initialized here if we are on the device, though | |
| 135 // the mixer may not have finished initializing yet. | |
| 136 DCHECK(AudioHandler::GetInstance() || | |
| 137 !system::runtime_environment::IsRunningOnChromeOS()); | |
| 138 if (AudioHandler::GetInstance()) | |
| 139 AudioHandler::GetInstance()->AddVolumeObserver(this); | |
| 140 } | |
| 141 | |
| 142 AudioHandler::VolumeObserver::~VolumeObserver() { | |
| 143 if (AudioHandler::GetInstance()) | |
| 144 AudioHandler::GetInstance()->RemoveVolumeObserver(this); | |
| 145 } | |
| 146 | |
| 116 } // namespace chromeos | 147 } // namespace chromeos |
| OLD | NEW |