media/audio/linux/audio_manager_linux.h - Issue 7117001: Simplify AlsaPcmOutputStream and AudioManagerLinux. Code was thread-safe, but now

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 7117001: Simplify AlsaPcmOutputStream and AudioManagerLinux. Code was thread-safe, but now (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: '' Created 9 years, 6 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

Index: media/audio/linux/audio_manager_linux.h

===================================================================

--- media/audio/linux/audio_manager_linux.h (revision 88131)

+++ media/audio/linux/audio_manager_linux.h (working copy)

@@ -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 @@

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);

};

« no previous file with comments | « media/audio/linux/alsa_output_unittest.cc ('k') | media/audio/linux/audio_manager_linux.cc » ('j') | no next file with comments »