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

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

Issue 7473021: PulseAudio Sound Playback on Linux (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: "Gyp and command line flag added, pausing/stopping/restarting works" Created 9 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 | « no previous file | media/audio/linux/audio_manager_linux.cc » ('j') | media/audio/linux/pulse_output.h » ('J')
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 6e060912e8b5210bef6625e8ebfdf545fd7f3a68..815f4c7b50ceeec452c4337ebde6f08d6990477b 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -13,6 +13,7 @@
class AlsaPcmOutputStream;
class AlsaWrapper;
+class PulseOutputStream;
vrk (LEFT CHROMIUM) 2011/08/05 15:02:26 unused; remove
slock 2011/08/08 20:30:15 Done. Also removed line 14.
class AudioManagerLinux : public AudioManagerBase {
public:
@@ -34,7 +35,7 @@ class AudioManagerLinux : public AudioManagerBase {
virtual void MuteAll();
virtual void UnMuteAll();
- virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream);
+ virtual void ReleaseOutputStream(AudioOutputStream* stream);
protected:
virtual ~AudioManagerLinux();
@@ -45,7 +46,7 @@ class AudioManagerLinux : public AudioManagerBase {
scoped_ptr<AlsaWrapper> wrapper_;
- std::set<AlsaPcmOutputStream*> active_streams_;
+ std::set<AudioOutputStream*> active_streams_;
DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
};
« no previous file with comments | « no previous file | media/audio/linux/audio_manager_linux.cc » ('j') | media/audio/linux/pulse_output.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698