WebRTC Audio private API: removing WebRtcAudioPrivate(Set/Get)ActiveSinkFunction

media/audio/audio_output_controller.cc

 // 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.
 
 #include "media/audio/audio_output_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 83 matching lines @@
   message_loop_->PostTaskAndReply(FROM_HERE, base::Bind(
       &AudioOutputController::DoClose, this), closed_task);
 }
 
 void AudioOutputController::SetVolume(double volume) {
   CHECK_EQ(AudioManager::Get(), audio_manager_);
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &AudioOutputController::DoSetVolume, this, volume));
 }
 
-void AudioOutputController::GetOutputDeviceId(
-    base::Callback<void(const std::string&)> callback) const {
-  CHECK_EQ(AudioManager::Get(), audio_manager_);
-  base::PostTaskAndReplyWithResult(
-      message_loop_.get(),
-      FROM_HERE,
-      base::Bind(&AudioOutputController::DoGetOutputDeviceId, this),
-      callback);
-}
-
-void AudioOutputController::SwitchOutputDevice(
-    const std::string& output_device_id, const base::Closure& callback) {
-  CHECK_EQ(AudioManager::Get(), audio_manager_);
-  message_loop_->PostTaskAndReply(
-      FROM_HERE,
-      base::Bind(&AudioOutputController::DoSwitchOutputDevice, this,
-                 output_device_id),
-      callback);
-}
-
 void AudioOutputController::DoCreate(bool is_for_device_change) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioOutputController.CreateTime");
   TRACE_EVENT0("audio", "AudioOutputController::DoCreate");
 
   // Close() can be called before DoCreate() is executed.
   if (state_ == kClosed)
     return;
 
   DoStopCloseAndClearStream();  // Calls RemoveOutputDeviceChangeListener().
@@ skipping 122 matching lines @@
     case kCreated:
     case kPlaying:
     case kPaused:
       stream_->SetVolume(volume_);
       break;
     default:
       return;
   }
 }
 
-std::string AudioOutputController::DoGetOutputDeviceId() const {
-  DCHECK(message_loop_->BelongsToCurrentThread());
-  return output_device_id_;
-}
-
-void AudioOutputController::DoSwitchOutputDevice(
-    const std::string& output_device_id) {
-  DCHECK(message_loop_->BelongsToCurrentThread());
-
-  if (state_ == kClosed)
-    return;
-
-  if (output_device_id == output_device_id_)
-    return;
-
-  output_device_id_ = output_device_id;
-
-  // If output is currently diverted, we must not call OnDeviceChange
-  // since it would break the diverted setup. Once diversion is
-  // finished using StopDiverting() the output will switch to the new
-  // device ID.
-  if (stream_ != diverting_to_stream_)
-    OnDeviceChange();
-}
-
 void AudioOutputController::DoReportError() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   if (state_ != kClosed)
     handler_->OnControllerError();
 }
 
 int AudioOutputController::OnMoreData(base::TimeDelta delay,
                                       base::TimeTicks delay_timestamp,
                                       int prior_frames_skipped,
                                       AudioBus* dest) {
@@ skipping 204 matching lines @@
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   // If we should be playing and we haven't, that's a wedge.
   if (state_ == kPlaying) {
     UMA_HISTOGRAM_BOOLEAN("Media.AudioOutputControllerPlaybackStartupSuccess",
                           base::AtomicRefCountIsOne(&on_more_io_data_called_));
   }
 }
 
 }  // namespace media