media/audio/linux/audio_manager_linux.h - Issue 7473021: PulseAudio Sound Playback on Linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: "Uncommented thing I forgot to uncomment" 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:

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..c50cabdf51e5026de59f66bd94e57f789e151d41 100644

--- a/media/audio/linux/audio_manager_linux.h

+++ b/media/audio/linux/audio_manager_linux.h

@@ -11,7 +11,6 @@

#include "base/threading/thread.h"

#include "media/audio/audio_manager_base.h"

-class AlsaPcmOutputStream;

class AlsaWrapper;

class AudioManagerLinux : public AudioManagerBase {

@@ -34,7 +33,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 +44,7 @@ class AudioManagerLinux : public AudioManagerBase {

scoped_ptr<AlsaWrapper> wrapper_;

- std::set<AlsaPcmOutputStream*> active_streams_;

+ std::set<AudioOutputStream*> active_streams_;

DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);

};