diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:16:50 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:16:50 +0000 |
| commit | 92355685a6dd03537f78c612117ab5fc871009ec (patch) | |
| tree | 38a1410be41a5facaf8c84aec4c24344c61b2c9a /media/audio/audio_manager_base.cc | |
| parent | b0f54b647d4f51afdf5c9a25fe21dfc2fd67807a (diff) | |
| download | chromium_src-92355685a6dd03537f78c612117ab5fc871009ec.zip chromium_src-92355685a6dd03537f78c612117ab5fc871009ec.tar.gz chromium_src-92355685a6dd03537f78c612117ab5fc871009ec.tar.bz2 | |
Revert 105333: OVERRIDE failures on asan - Add a method to the audio manager to find out if recording is currently active in Chrome.
Adding also missing OVERRIDEs in the affected files.
BUG=97388
TEST=none
Review URL: http://codereview.chromium.org/8208013
TBR=leandrogracia@chromium.org
Review URL: http://codereview.chromium.org/8276008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_manager_base.cc')
| -rw-r--r-- | media/audio/audio_manager_base.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 5053e87..d0614f4 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -12,8 +12,7 @@ const char AudioManagerBase::kDefaultDeviceName[] = "Default"; AudioManagerBase::AudioManagerBase() : audio_thread_("AudioThread"), - initialized_(false), - num_active_input_streams_(0) { + initialized_(false) { } AudioManagerBase::~AudioManagerBase() { @@ -63,19 +62,3 @@ void AudioManagerBase::ShowAudioInputSettings() { void AudioManagerBase::GetAudioInputDeviceNames( media::AudioDeviceNames* device_names) { } - -void AudioManagerBase::IncreaseActiveInputStreamCount() { - base::AutoLock auto_lock(active_input_streams_lock_); - ++num_active_input_streams_; -} - -void AudioManagerBase::DecreaseActiveInputStreamCount() { - base::AutoLock auto_lock(active_input_streams_lock_); - DCHECK_GT(num_active_input_streams_, 0); - --num_active_input_streams_; -} - -bool AudioManagerBase::IsRecordingInProcess() { - base::AutoLock auto_lock(active_input_streams_lock_); - return num_active_input_streams_ > 0; -} |