media/audio/linux/audio_manager_linux.h - Issue 8491044: Link things together and enable the device selection for linux and mac.

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 8491044: Link things together and enable the device selection for linux and mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: enable the device selection for linux and mac Created 9 years, 1 month 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 ed08a1a270acbeedc85f389a29c799c71219d767..7580640617ed92ef02e168171e034a31b7e87425 100644

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

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

@@ -26,8 +26,8 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {

virtual bool HasAudioInputDevices() OVERRIDE;

virtual AudioOutputStream* MakeAudioOutputStream(

const AudioParameters& params) OVERRIDE;

- virtual AudioInputStream* MakeAudioInputStream(const AudioParameters& params)

- OVERRIDE;

+ virtual AudioInputStream* MakeAudioInputStream(

+ const AudioParameters& params, const std::string& device_uid) OVERRIDE;

virtual bool CanShowAudioInputSettings() OVERRIDE;

virtual void ShowAudioInputSettings() OVERRIDE;

virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)