SetVolume and GetVolume take one volume instead of separate left and right vo...

media/audio/linux/audio_manager_linux.cc

 // Copyright (c) 2006-2009 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/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/base/media_switches.h"
 
 
 namespace {
+
 AudioManagerLinux* g_audio_manager = NULL;
 }  // namespace
 
 // Implementation of AudioManager.
 bool AudioManagerLinux::HasAudioDevices() {
   // TODO(ajwong): Make this actually query audio devices.
   return true;
 }
 
 AudioOutputStream* AudioManagerLinux::MakeAudioStream(Format format,
@@ skipping 41 matching lines @@
 
 void AudioManagerLinux::MuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerLinux::UnMuteAll() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerLinux::ReleaseStream(AlsaPcmOutputStream* stream) {
-  AutoLock l(lock_);
-  active_streams_.erase(stream);
+  if (stream) {
+    AutoLock l(lock_);
+    active_streams_.erase(stream);
+  }
 }
 
 // TODO(ajwong): Collapse this with the windows version.
 void DestroyAudioManagerLinux(void* not_used) {
   delete g_audio_manager;
   g_audio_manager = NULL;
 }
 
 AudioManager* AudioManager::GetAudioManager() {
   if (!g_audio_manager) {
     g_audio_manager = new AudioManagerLinux();
     g_audio_manager->Init();
     base::AtExitManager::RegisterCallback(&DestroyAudioManagerLinux, NULL);
   }
   return g_audio_manager;
 }