Simplify AlsaPcmOutputStream and AudioManagerLinux. Code was thread-safe, but now

media/audio/linux/audio_manager_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/linux/audio_manager_linux.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
+#include "base/stl_util-inl.h"
 #include "media/audio/audio_output_dispatcher.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/linux/alsa_input.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
 // Maximum number of output streams that can be open simultaneously.
@@ skipping 78 matching lines @@
 
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAlsaOutputDevice)) {
     device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaOutputDevice);
   }
   AlsaPcmOutputStream* stream =
       new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this,
                               GetMessageLoop());
-
-  base::AutoLock l(lock_);
-  active_streams_[stream] = scoped_refptr<AlsaPcmOutputStream>(stream);
+  active_streams_.insert(stream);
   return stream;
 }
 
 AudioInputStream* AudioManagerLinux::MakeAudioInputStream(
     AudioParameters params) {
   if (!params.IsValid() || params.channels > kMaxInputChannels)
     return NULL;
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
     return FakeAudioInputStream::MakeFakeStream(params);
@@ skipping 23 matching lines @@
   // Make sure we stop the thread first. If we allow the default destructor to
   // destroy the members, we may destroy audio streams before stopping the
   // thread, resulting an unexpected behavior.
   // This way we make sure activities of the audio streams are all stopped
   // before we destroy them.
   audio_thread_.Stop();
 
   // Free output dispatchers, closing all remaining open streams.
   output_dispatchers_.clear();
 
-  active_streams_.clear();
+  // Delete all the streams. Have to do it manually, we don't have ScopedSet<>,
+  // and we are not using ScopedVector<> because search there is slow.
+  STLDeleteElements(&active_streams_);
 }
 
 void AudioManagerLinux::Init() {
   AudioManagerBase::Init();
   wrapper_.reset(new AlsaWrapper());
 }
 
 void AudioManagerLinux::MuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerLinux::UnMuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerLinux::ReleaseOutputStream(AlsaPcmOutputStream* stream) {
   if (stream) {
-    base::AutoLock l(lock_);
     active_streams_.erase(stream);
+    delete stream;
   }
 }
 
 bool AudioManagerLinux::CanShowAudioInputSettings() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   base::nix::DesktopEnvironment desktop = base::nix::GetDesktopEnvironment(
       env.get());
   return (desktop == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
           desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
           desktop == base::nix::DESKTOP_ENVIRONMENT_KDE4);
@@ skipping 41 matching lines @@
       return true;
   }
 
   return false;
 }
 
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerLinux();
 }