| Index: content/renderer/media/audio_device.h
|
| diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
|
| index de6ba3b0e2df9da6bd6a11b4fe5c44c5bee67b56..cb5c6a10b12cb3c476c41612f2ddefbfbb2ceba7 100644
|
| --- a/content/renderer/media/audio_device.h
|
| +++ b/content/renderer/media/audio_device.h
|
| @@ -24,14 +24,14 @@
|
| // Task [IO thread] IPC [IO thread]
|
| //
|
| // Start -> InitializeOnIOThread ------> AudioHostMsg_CreateStream -------->
|
| -// <- OnLowLatencyCreated <- AudioMsg_NotifyLowLatencyStreamCreated <-
|
| +// <- OnStreamCreated <- AudioMsg_NotifyStreamCreated <-
|
| // ---> PlayOnIOThread -----------> AudioHostMsg_PlayStream -------->
|
| //
|
| // Optionally Play() / Pause() sequences may occur:
|
| // Play -> PlayOnIOThread --------------> AudioHostMsg_PlayStream --------->
|
| // Pause -> PauseOnIOThread ------------> AudioHostMsg_PauseStream -------->
|
| -// (note that Play() / Pause() sequences before OnLowLatencyCreated are
|
| -// deferred until OnLowLatencyCreated, with the last valid state being used)
|
| +// (note that Play() / Pause() sequences before OnStreamCreated are
|
| +// deferred until OnStreamCreated, with the last valid state being used)
|
| //
|
| // AudioDevice::Render => audio transport on audio thread with low latency =>
|
| // |
|
| @@ -132,14 +132,10 @@ class CONTENT_EXPORT AudioDevice
|
|
|
| // Methods called on IO thread ----------------------------------------------
|
| // AudioMessageFilter::Delegate methods, called by AudioMessageFilter.
|
| - virtual void OnRequestPacket(AudioBuffersState buffers_state) OVERRIDE;
|
| virtual void OnStateChanged(AudioStreamState state) OVERRIDE;
|
| - virtual void OnCreated(base::SharedMemoryHandle handle,
|
| - uint32 length) OVERRIDE;
|
| - virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
|
| - base::SyncSocket::Handle socket_handle,
|
| - uint32 length) OVERRIDE;
|
| - virtual void OnVolume(double volume) OVERRIDE;
|
| + virtual void OnStreamCreated(base::SharedMemoryHandle handle,
|
| + base::SyncSocket::Handle socket_handle,
|
| + uint32 length) OVERRIDE;
|
|
|
| private:
|
| // Magic required by ref_counted.h to avoid any code deleting the object
|
| @@ -207,10 +203,10 @@ class CONTENT_EXPORT AudioDevice
|
| // Must only be modified on the IO thread.
|
| int32 stream_id_;
|
|
|
| - // State of Play() / Pause() calls before OnLowLatencyCreated() is called.
|
| + // State of Play() / Pause() calls before OnStreamCreated() is called.
|
| bool play_on_start_;
|
|
|
| - // Set to |true| when OnLowLatencyCreated() is called.
|
| + // Set to |true| when OnStreamCreated() is called.
|
| // Set to |false| when ShutDownOnIOThread() is called.
|
| // This is for use with play_on_start_ to track Play() / Pause() state.
|
| // Must only be touched from the IO thread.
|
|
|