| Index: media/audio/audio_output_controller.h
|
| diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
|
| index f3d4b428425134b89f62f844ca889b9cd994f8a8..c18216f64d9c9c5b0638f7412c5ad705e8c8ee96 100644
|
| --- a/media/audio/audio_output_controller.h
|
| +++ b/media/audio/audio_output_controller.h
|
| @@ -148,23 +148,6 @@ class MEDIA_EXPORT AudioOutputController
|
| // Sets the volume of the audio output stream.
|
| void SetVolume(double volume);
|
|
|
| - // Calls |callback| (on the caller's thread) with the current output
|
| - // device ID.
|
| - void GetOutputDeviceId(
|
| - base::Callback<void(const std::string&)> callback) const;
|
| -
|
| - // Changes which output device to use. If desired, you can provide a
|
| - // callback that will be notified (on the thread you called from)
|
| - // when the function has completed execution.
|
| - //
|
| - // Changing the output device causes the controller to go through
|
| - // the same state transition back to the current state as a call to
|
| - // OnDeviceChange (unless it is currently diverting, see
|
| - // Start/StopDiverting below, in which case the state transition
|
| - // will happen when StopDiverting is called).
|
| - void SwitchOutputDevice(const std::string& output_device_id,
|
| - const base::Closure& callback);
|
| -
|
| // AudioSourceCallback implementation.
|
| int OnMoreData(base::TimeDelta delay,
|
| base::TimeTicks delay_timestamp,
|
| @@ -219,8 +202,6 @@ class MEDIA_EXPORT AudioOutputController
|
| void DoPause();
|
| void DoClose();
|
| void DoSetVolume(double volume);
|
| - std::string DoGetOutputDeviceId() const;
|
| - void DoSwitchOutputDevice(const std::string& output_device_id);
|
| void DoReportError();
|
| void DoStartDiverting(AudioOutputStream* to_stream);
|
| void DoStopDiverting();
|
|
|