media/audio/linux/alsa_output.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

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/alsa_output.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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/alsa_output.h

diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h

index 25ff055f53d9e8305bf73a12fb2e0562c8f0326c..f2999c188f42d693ebc28d6c7303454d5bc69385 100644

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

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

@@ -40,9 +40,9 @@

#include <string>

#include "base/gtest_prod_util.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

#include "base/scoped_ptr.h"

+#include "base/synchronization/lock.h"

#include "media/audio/audio_io.h"

#include "media/audio/audio_parameters.h"

@@ -193,7 +193,7 @@ class AlsaPcmOutputStream :

void set_source_callback(AudioSourceCallback* callback);

private:

- Lock lock_;

+ base::Lock lock_;

InternalState state_;

float volume_; // Volume level from 0.0 to 1.0.

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