summaryrefslogtreecommitdiffstats
path: root/media/audio/linux/audio_manager_linux.h
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio/linux/audio_manager_linux.h')
-rw-r--r--media/audio/linux/audio_manager_linux.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 6a5d287..52d2940 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -5,11 +5,9 @@
#ifndef MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
#define MEDIA_AUDIO_LINUX_AUDIO_MANAGER_LINUX_H_
-#include <map>
+#include <set>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
#include "media/audio/audio_manager_base.h"
@@ -46,9 +44,7 @@ class AudioManagerLinux : public AudioManagerBase {
scoped_ptr<AlsaWrapper> wrapper_;
- base::Lock lock_;
- std::map<AlsaPcmOutputStream*, scoped_refptr<AlsaPcmOutputStream> >
- active_streams_;
+ std::set<AlsaPcmOutputStream*> active_streams_;
DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
};