Share one thread between all AudioOutputControllers instead of creating one per stream.

TEST=unittests
BUG=39825

Review URL: http://codereview.chromium.org/3185022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57254 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 7 deletions

diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index ea335f0..2703eed 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -11,12 +11,12 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
-#include "media/audio/audio_io.h"
+#include "media/audio/audio_manager_base.h"
 
 class AlsaPcmOutputStream;
 class AlsaWrapper;
 
-class AudioManagerLinux : public AudioManager {
+class AudioManagerLinux : public AudioManagerBase {
  public:
   AudioManagerLinux();
 
@@ -44,17 +44,12 @@ class AudioManagerLinux : public AudioManager {
   virtual ~AudioManagerLinux();
 
  private:
-  // Thread used to interact with AudioOutputStreams created by this
-  // audio manger.
-  base::Thread audio_thread_;
   scoped_ptr<AlsaWrapper> wrapper_;
 
   Lock lock_;
   std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> >
       active_streams_;
 
-  bool initialized_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
 };