Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

content/renderer/media/track_audio_renderer.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_TRACK_AUDIO_RENDERER_H_
 #define CONTENT_RENDERER_MEDIA_TRACK_AUDIO_RENDERER_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/media_stream_audio_renderer.h"
 #include "content/public/renderer/media_stream_audio_sink.h"
 #include "media/base/audio_renderer_sink.h"
-#include "media/base/output_device.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 
 namespace media {
 class AudioBus;
 class AudioShifter;
 class AudioParameters;
 }
 
 namespace content {
 
@@ skipping 12 matching lines @@
 // Audio data is feed-in from the source via calls to OnData().  The
 // internally-owned media::AudioOutputDevice calls Render() to pull-out that
 // audio data.  However, because of clock differences and other environmental
 // factors, the audio will inevitably feed-in at a rate different from the rate
 // it is being rendered-out.  media::AudioShifter is used to buffer, stretch
 // and skip audio to maintain time synchronization between the producer and
 // consumer.
 class CONTENT_EXPORT TrackAudioRenderer
     : NON_EXPORTED_BASE(public MediaStreamAudioRenderer),
       NON_EXPORTED_BASE(public MediaStreamAudioSink),
-      NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback),
-      NON_EXPORTED_BASE(public media::OutputDevice) {
+      NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback) {
  public:
   // Creates a renderer for the given |audio_track|.  |playout_render_frame_id|
   // refers to the RenderFrame that owns this instance (e.g., it contains the
   // DOM widget representing the player).  |session_id| and |device_id| are
   // optional, and are used to direct audio output to a pre-selected device;
   // otherwise, audio is output to the default device for the system.
   //
   // Called on the main thread.
   TrackAudioRenderer(const blink::WebMediaStreamTrack& audio_track,
                      int playout_render_frame_id,
                      int session_id,
                      const std::string& device_id,
                      const url::Origin& security_origin);
 
   // MediaStreamAudioRenderer implementation.
   // Called on the main thread.
   void Start() override;
   void Stop() override;
   void Play() override;
   void Pause() override;
   void SetVolume(float volume) override;
-  media::OutputDevice* GetOutputDevice() override;
+  media::OutputDeviceInfo GetOutputDeviceInfo() override;
   base::TimeDelta GetCurrentRenderTime() const override;
   bool IsLocalRenderer() const override;
-
-  // media::OutputDevice implementation
   void SwitchOutputDevice(const std::string& device_id,
                           const url::Origin& security_origin,
-                          const media::SwitchOutputDeviceCB& callback) override;
-  media::AudioParameters GetOutputParameters() override;
-  media::OutputDeviceStatus GetDeviceStatus() override;
+                          const media::OutputDeviceStatusCB& callback) override;
 
  protected:
   ~TrackAudioRenderer() override;
 
  private:
   // MediaStreamAudioSink implementation.
 
   // Called on the AudioInputDevice worker thread.
   void OnData(const media::AudioBus& audio_bus,
               base::TimeTicks reference_time) override;
@@ skipping 80 matching lines @@
 
   // Used to DCHECK that some methods are called on the audio thread.
   base::ThreadChecker audio_thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(TrackAudioRenderer);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_TRACK_AUDIO_RENDERER_H_