content/renderer/media/audio_input_device.h - Issue 9121045: Switch AudioDevice classes from SyncSocket to CancelableSyncSocket.

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: content/renderer/media/audio_input_device.h

Issue 9121045: Switch AudioDevice classes from SyncSocket to CancelableSyncSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments, add temporary ScopedAllowIO for the audio thread cleanup+TODO for next cl. Created 8 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:

Index: content/renderer/media/audio_input_device.h

diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h

index ec7452559c409b20396392ac92bd7f2cb9e474ac..2529f79c2f8517f1bc1aa4357c61b5925cd07d63 100644

--- a/content/renderer/media/audio_input_device.h

+++ b/content/renderer/media/audio_input_device.h

@@ -164,6 +164,8 @@ class CONTENT_EXPORT AudioInputDevice

void StartOnIOThread();

void ShutDownOnIOThread(base::WaitableEvent* completion);

void SetVolumeOnIOThread(double volume);

+ // Closes socket and joins with the audio thread.

+ void ShutDownAudioThread();

void Send(IPC::Message* message);

@@ -209,7 +211,7 @@ class CONTENT_EXPORT AudioInputDevice

bool pending_device_ready_;

base::SharedMemoryHandle shared_memory_handle_;

- base::SyncSocket::Handle socket_handle_;

+ scoped_ptr<base::CancelableSyncSocket> audio_socket_;

int memory_length_;

DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputDevice);