diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 11:41:45 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 11:41:45 +0000 |
| commit | 7fe1b7ec82fc98444ac2cec82c5d70c8c8f6d216 (patch) | |
| tree | 32dfc950508ba65834c80a8f9973c1d4ee344d5f /media/audio/pulse | |
| parent | 2499234d92686f2a5889f9b01867b8ae14a655e2 (diff) | |
| download | chromium_src-7fe1b7ec82fc98444ac2cec82c5d70c8c8f6d216.zip chromium_src-7fe1b7ec82fc98444ac2cec82c5d70c8c8f6d216.tar.gz chromium_src-7fe1b7ec82fc98444ac2cec82c5d70c8c8f6d216.tar.bz2 | |
Add the necessary scaffolding to allow creation of non-default audio output devices.
The implementation still assumes an empty device id (aka the default device), so this is only updating virtual methods and call sites.
BUG=276894
R=henrika@chromium.org
Review URL: https://codereview.chromium.org/23452009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
| -rw-r--r-- | media/audio/pulse/audio_manager_pulse.cc | 8 | ||||
| -rw-r--r-- | media/audio/pulse/audio_manager_pulse.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc index dcdd328..47b603b 100644 --- a/media/audio/pulse/audio_manager_pulse.cc +++ b/media/audio/pulse/audio_manager_pulse.cc @@ -123,7 +123,10 @@ AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream( } AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream( - const AudioParameters& params, const std::string& input_device_id) { + const AudioParameters& params, + const std::string& device_id, + const std::string& input_device_id) { + DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); return MakeOutputStream(params, input_device_id); } @@ -141,7 +144,10 @@ AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream( } AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters( + const std::string& output_device_id, const AudioParameters& input_params) { + // TODO(tommi): Support |output_device_id|. + DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; static const int kDefaultOutputBufferSize = 512; ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h index 6dfebae..f46f2be 100644 --- a/media/audio/pulse/audio_manager_pulse.h +++ b/media/audio/pulse/audio_manager_pulse.h @@ -35,6 +35,7 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { const AudioParameters& params) OVERRIDE; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, + const std::string& device_id, const std::string& input_device_id) OVERRIDE; virtual AudioInputStream* MakeLinearInputStream( const AudioParameters& params, const std::string& device_id) OVERRIDE; @@ -43,6 +44,7 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { protected: virtual AudioParameters GetPreferredOutputStreamParameters( + const std::string& output_device_id, const AudioParameters& input_params) OVERRIDE; private: |