| Index: media/audio/audio_manager_base.h
|
| ===================================================================
|
| --- media/audio/audio_manager_base.h (revision 162015)
|
| +++ media/audio/audio_manager_base.h (working copy)
|
| @@ -12,37 +12,20 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "base/threading/thread.h"
|
| #include "media/audio/audio_manager.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "base/win/scoped_com_initializer.h"
|
| #endif
|
|
|
| +namespace base {
|
| +class Thread;
|
| +}
|
| +
|
| namespace media {
|
|
|
| class AudioOutputDispatcher;
|
|
|
| -// Thread that enters MTA on Windows.
|
| -#if defined(OS_WIN)
|
| -class AudioThread : public base::Thread {
|
| - public:
|
| - explicit AudioThread(const char* name);
|
| - virtual ~AudioThread();
|
| -
|
| - protected:
|
| - virtual void Init() OVERRIDE;
|
| - virtual void CleanUp() OVERRIDE;
|
| -
|
| - private:
|
| - scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AudioThread);
|
| -};
|
| -#else
|
| -typedef base::Thread AudioThread;
|
| -#endif
|
| -
|
| // AudioManagerBase provides AudioManager functions common for all platforms.
|
| class MEDIA_EXPORT AudioManagerBase : public AudioManager {
|
| public:
|
| @@ -129,7 +112,7 @@
|
|
|
| // Thread used to interact with AudioOutputStreams created by this
|
| // audio manger.
|
| - scoped_ptr<AudioThread> audio_thread_;
|
| + scoped_ptr<base::Thread> audio_thread_;
|
| mutable base::Lock audio_thread_lock_;
|
|
|
| // Map of cached AudioOutputDispatcher instances. Must only be touched
|
|
|