Refactor android specific code in AudioManagerBase class.

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 <string>
 #include <utility>
 
 #include "base/atomic_ref_count.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/audio_manager.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#endif
-
 namespace base {
 class Thread;
 }
 
 namespace media {
 
 class AudioOutputDispatcher;
 
 // AudioManagerBase provides AudioManager functions common for all platforms.
 class MEDIA_EXPORT AudioManagerBase : public AudioManager {
@@ skipping 19 matching lines @@
 
   virtual AudioInputStream* MakeAudioInputStream(
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
 
   virtual AudioOutputStream* MakeAudioOutputStreamProxy(
       const AudioParameters& params) OVERRIDE;
 
   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);
+  virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE;
+  virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE;
 
   void IncreaseActiveInputStreamCount();
   void DecreaseActiveInputStreamCount();
 
   // 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.
@@ skipping 12 matching lines @@
   // Listeners will be notified on the AudioManager::GetMessageLoop() loop.
   virtual void AddOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
   virtual void RemoveOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
 
   virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE;
   virtual AudioParameters GetInputStreamParameters(
       const std::string& device_id) OVERRIDE;
 
-#if defined(OS_ANDROID)
-  static bool RegisterAudioManager(JNIEnv* env);
-#endif
-
  protected:
   AudioManagerBase();
 
   // TODO(dalecurtis): This must change to map both input and output parameters
   // to a single dispatcher, otherwise on a device state change we'll just get
   // the exact same invalid dispatcher.
   typedef std::map<std::pair<AudioParameters, AudioParameters>,
                    scoped_refptr<AudioOutputDispatcher> >
       AudioOutputDispatchersMap;
 
@@ skipping 15 matching lines @@
   // will decide if they should return the values from |input_params| or the
   // default hardware values. If the |input_params| is invalid, it will return
   // the default hardware audio parameters.
   virtual AudioParameters GetPreferredOutputStreamParameters(
       const AudioParameters& input_params) = 0;
 
   // Map of cached AudioOutputDispatcher instances.  Must only be touched
   // from the audio thread (no locking).
   AudioOutputDispatchersMap output_dispatchers_;
 
+  // Get number of input or output streams.
+  int GetNumInputStreams() { return num_input_streams_; }

[DaleCurtis, 2013/04/15 21:17:31]

The style guide says inline methods should be hacker style, so this needs to be
num_input_streams() or, my preference, input_stream_count().  Ditto for output.

[leozwang1, 2013/04/15 21:44:56]

sorry, corrected.

+  int GetNumOutputStreams() { return num_output_streams_; }
+
  private:
   // Called by Shutdown().
   void ShutdownOnAudioThread();
 
-#if defined(OS_ANDROID)
-  void SetAudioMode(int mode);
-  void RegisterHeadsetReceiver();
-  void UnregisterHeadsetReceiver();
-#endif
-
   // 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_;
 
   // Track output state change listeners.
   ObserverList<AudioDeviceListener> output_listeners_;
 
   // Thread used to interact with audio streams created by this audio manager.
   scoped_ptr<base::Thread> audio_thread_;
   mutable base::Lock audio_thread_lock_;
 
   // The message loop of the audio thread this object runs on. Used for internal
   // tasks which run on the audio thread even after Shutdown() has been started
   // and GetMessageLoop() starts returning NULL.
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
-#if defined(OS_ANDROID)
-  // Java AudioManager instance.
-  base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_