Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/blink/webaudiosourceprovider_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/webaudiosourceprovider_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 69 matching lines @@
   AudioRendererSink::RenderCallback* const renderer_;
   const int channels_;
   const int sample_rate_;
 
   WebAudioSourceProviderImpl::CopyAudioCB copy_audio_bus_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TeeFilter);
 };
 
 WebAudioSourceProviderImpl::WebAudioSourceProviderImpl(
-    const scoped_refptr<RestartableAudioRendererSink>& sink)
+    const scoped_refptr<SwitchableAudioRendererSink>& sink)
     : volume_(1.0),
       state_(kStopped),
       client_(nullptr),
       sink_(sink),
       weak_factory_(this) {}
 
 WebAudioSourceProviderImpl::~WebAudioSourceProviderImpl() {
 }
 
 void WebAudioSourceProviderImpl::setClient(
@@ skipping 96 matching lines @@
   if (!client_)
     sink_->SetVolume(volume);
   return true;
 }
 
 OutputDevice* WebAudioSourceProviderImpl::GetOutputDevice() {
   base::AutoLock auto_lock(sink_lock_);
   return sink_->GetOutputDevice();
 }
 
+void WebAudioSourceProviderImpl::SwitchOutputDevice(
+    const std::string& device_id,
+    const url::Origin& security_origin,
+    const SwitchOutputDeviceCB& callback) {
+  base::AutoLock auto_lock(sink_lock_);
+  if (sink_)

[Guido Urdaneta, 2016/03/17 17:38:24]

Shouldn't this one also have the "!client" check that the other methods have?
Also, can sink_ be null? The other methods are not checking that.

[o1ka, 2016/03/18 10:45:40]

Agree. Done.

+    sink_->SwitchOutputDevice(device_id, security_origin, callback);
+  else
+    callback.Run(media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);
+}
+
 void WebAudioSourceProviderImpl::Initialize(const AudioParameters& params,
                                             RenderCallback* renderer) {
   base::AutoLock auto_lock(sink_lock_);
   DCHECK_EQ(state_, kStopped);
 
   tee_filter_ = make_scoped_ptr(
       new TeeFilter(renderer, params.channels(), params.sample_rate()));
 
   sink_->Initialize(params, tee_filter_.get());
 
@@ skipping 41 matching lines @@
   }
 
   return num_rendered_frames;
 }
 
 void WebAudioSourceProviderImpl::TeeFilter::OnRenderError() {
   renderer_->OnRenderError();
 }
 
 }  // namespace media