stopping the audio thread before destroying the AudioManager<Platform>

media/audio/audio_manager_base.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 
 #include <map>
 
 #include "base/atomic_ref_count.h"
@@ skipping 41 matching lines @@
 
   virtual bool IsRecordingInProcess() OVERRIDE;
 
   // Called internally by the audio stream when it has been closed.
   virtual void ReleaseOutputStream(AudioOutputStream* stream);
   virtual void ReleaseInputStream(AudioInputStream* stream);
 
   void IncreaseActiveInputStreamCount();
   void DecreaseActiveInputStreamCount();
 
-  // Shuts down the audio thread and releases all the audio output dispatchers
-  // on the audio thread.  All AudioOutputProxy instances should be freed before
-  // Shutdown is called.
-  void Shutdown();
-
   // Creates the output stream for the |AUDIO_PCM_LINEAR| format. The legacy
   // name is also from |AUDIO_PCM_LINEAR|.
   virtual AudioOutputStream* MakeLinearOutputStream(
       const AudioParameters& params) = 0;
 
   // Creates the output stream for the |AUDIO_PCM_LOW_LATENCY| format.
   virtual AudioOutputStream* MakeLowLatencyOutputStream(
       const AudioParameters& params) = 0;
 
   // Creates the input stream for the |AUDIO_PCM_LINEAR| format. The legacy
   // name is also from |AUDIO_PCM_LINEAR|.
   virtual AudioInputStream* MakeLinearInputStream(
       const AudioParameters& params, const std::string& device_id) = 0;
 
   // Creates the input stream for the |AUDIO_PCM_LOW_LATENCY| format.
   virtual AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params, const std::string& device_id) = 0;
 
  protected:
   AudioManagerBase();
 
   typedef std::map<AudioParameters, scoped_refptr<AudioOutputDispatcher>,
                    AudioParameters::Compare>
       AudioOutputDispatchersMap;
 
+  // Shuts down the audio thread and releases all the audio output dispatchers
+  // on the audio thread.  All audio streams should be freed before
+  // Shutdown is called.
+  // This must be called in the destructor of the AudioManager<Platform>.
+  void Shutdown();
+
   void ShutdownOnAudioThread();
 
   void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
 
   // Thread used to interact with AudioOutputStreams created by this
   // audio manger.
   scoped_ptr<base::Thread> audio_thread_;
   mutable base::Lock audio_thread_lock_;
 
   // Map of cached AudioOutputDispatcher instances.  Must only be touched
   // from the audio thread (no locking).
   AudioOutputDispatchersMap output_dispatchers_;
 
  private:
   // Counts the number of active input streams to find out if something else
   // is currently recording in Chrome.
   base::AtomicRefCount num_active_input_streams_;
 
   // Max number of open output streams, modified by
   // SetMaxOutputStreamsAllowed().
   int max_num_output_streams_;
 
+  // Max number of open input streams.
+  int max_num_input_streams_;
+
   // Number of currently open output streams.
   int num_output_streams_;
 
+  // Number of currently open input streams.
+  int num_input_streams_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_