Move some generic functions to AudioManagerBase to be inherited by platform-specific AudioManager***

media/audio/linux/alsa_input.cc

 // Copyright (c) 2012 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/alsa_input.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 229 matching lines @@
   // also called when closing the input controller.
   audio_manager_->DecreaseActiveInputStreamCount();
 
   weak_factory_.InvalidateWeakPtrs();  // Cancel the next scheduled read.
   int error = wrapper_->PcmDrop(device_handle_);
   if (error < 0)
     HandleError("PcmDrop", error);
 }
 
 void AlsaPcmInputStream::Close() {
-  scoped_ptr<AlsaPcmInputStream> self_deleter(this);
+  if (device_handle_) {
+    weak_factory_.InvalidateWeakPtrs();  // Cancel the next scheduled read.
+    int error = alsa_util::CloseDevice(wrapper_, device_handle_);
+    if (error < 0)
+      HandleError("PcmClose", error);
 
-  // Check in case we were already closed or not initialized yet.
-  if (!device_handle_)
-    return;
+    if (mixer_handle_)

[tommi (sloooow) - chröme, 2012/03/05 14:28:28]

where is mixer_handle_ set to NULL?
... I guess it's not needed here since we're about to delete the object, but
since we do it for audio_packet_ and device_handle_, we might as well do it for
mixer_handle_, right?

[no longer working on chromium, 2012/03/06 15:27:07]

Done.

+      alsa_util::CloseMixer(wrapper_, mixer_handle_, device_name_);
 
-  weak_factory_.InvalidateWeakPtrs();  // Cancel the next scheduled read.
-  int error = alsa_util::CloseDevice(wrapper_, device_handle_);
-  if (error < 0)
-    HandleError("PcmClose", error);
+    audio_packet_.reset();
+    device_handle_ = NULL;
 
-  if (mixer_handle_)
-    alsa_util::CloseMixer(wrapper_, mixer_handle_, device_name_);
+    if (callback_)
+      callback_->OnClose(this);
+  }
 
-  audio_packet_.reset();
-  device_handle_ = NULL;
-
-  if (callback_)
-    callback_->OnClose(this);
+  audio_manager_->ReleaseInputStream(this);
 }
 
 double AlsaPcmInputStream::GetMaxVolume() {
   if (!mixer_handle_ || !mixer_element_handle_) {
     DLOG(WARNING) << "GetMaxVolume is not supported for " << device_name_;
     return 0.0;
   }
 
   if (!wrapper_->MixerSelemHasCaptureVolume(mixer_element_handle_)) {
     DLOG(WARNING) << "Unsupported microphone volume for " << device_name_;
@@ skipping 42 matching lines @@
     return 0.0;
   }
 
   return static_cast<double>(current_volume);
 }
 
 void AlsaPcmInputStream::HandleError(const char* method, int error) {
   LOG(WARNING) << method << ": " << wrapper_->StrError(error);
   callback_->OnError(this, error);
 }