Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Unified Diff: media/audio/linux/audio_manager_linux.h

Issue 3185022: Share one thread between all AudioOutputControllers instead of creating one per stream. (Closed)
Patch Set: - Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/audio_manager_linux.h
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index ea335f0de622564d267e2dd432bd1fb137399b09..2703eed5708638d0598c07b26f900ae64fa61d63 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);
};
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698