summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_output_controller.h
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio/audio_output_controller.h')
-rw-r--r--media/audio/audio_output_controller.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 8208e28..e9ed321 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -14,7 +14,6 @@
#include "media/audio/simple_sources.h"
class MessageLoop;
-class Task;
// An AudioOutputController controls an AudioOutputStream and provides data
// to this output stream. It has an important function that it executes
@@ -135,14 +134,13 @@ class AudioOutputController
// has effect when the stream is paused.
void Flush();
- // Closes the audio output stream. The state is changed and the resources
- // are freed on the audio thread. closed_task is executed after that.
- // Callbacks (EventHandler and SyncReader) must exist until closed_task is
- // called.
+ // Closes the audio output stream. It changes state to kClosed and returns
+ // right away. The physical resources are freed on the audio thread if
+ // neccessary.
//
// It is safe to call this method more than once. Calls after the first one
// will have no effect.
- void Close(Task* closed_task);
+ void Close();
// Sets the volume of the audio output stream.
void SetVolume(double volume);
@@ -170,7 +168,7 @@ class AudioOutputController
void DoPlay();
void DoPause();
void DoFlush();
- void DoClose(Task* closed_task);
+ void DoClose();
void DoSetVolume(double volume);
void DoReportError(int code);
@@ -192,7 +190,8 @@ class AudioOutputController
uint32 hardware_pending_bytes_;
base::Time last_callback_time_;
- // The |lock_| must be acquired whenever we access |push_source_|.
+ // The |lock_| must be acquired whenever we access |state_| or call
+ // |handler_|.
Lock lock_;
// PushSource role is to buffer and it's only used in regular latency mode.