| Index: media/audio/audio_output_dispatcher_impl.cc
|
| diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc
|
| index 7e08799e6e6f5942643bb56c205174d39eaa2dac..bcdcd65146e8294813ec65a40f1339b5675e15b3 100644
|
| --- a/media/audio/audio_output_dispatcher_impl.cc
|
| +++ b/media/audio/audio_output_dispatcher_impl.cc
|
| @@ -19,9 +19,11 @@ namespace media {
|
| AudioOutputDispatcherImpl::AudioOutputDispatcherImpl(
|
| AudioManager* audio_manager,
|
| const AudioParameters& params,
|
| + const std::string& output_device_id,
|
| const std::string& input_device_id,
|
| const base::TimeDelta& close_delay)
|
| - : AudioOutputDispatcher(audio_manager, params, input_device_id),
|
| + : AudioOutputDispatcher(audio_manager, params, output_device_id,
|
| + input_device_id),
|
| pause_delay_(base::TimeDelta::FromMicroseconds(
|
| 2 * params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
|
| static_cast<float>(params.sample_rate()))),
|
| @@ -168,7 +170,7 @@ void AudioOutputDispatcherImpl::Shutdown() {
|
| bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
|
| DCHECK_EQ(base::MessageLoop::current(), message_loop_);
|
| AudioOutputStream* stream = audio_manager_->MakeAudioOutputStream(
|
| - params_, "", input_device_id_);
|
| + params_, output_device_id_, input_device_id_);
|
| if (!stream)
|
| return false;
|
|
|
|
|