Index: media/audio/audio_output_dispatcher_impl.h |
diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h |
index b59f835f9b0a2e85720b10964167eccba7c5f048..f1b93b899011a18147bd9a08ecfeb07b4deab196 100644 |
--- a/media/audio/audio_output_dispatcher_impl.h |
+++ b/media/audio/audio_output_dispatcher_impl.h |
@@ -13,12 +13,11 @@ |
#ifndef MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_ |
#define MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_ |
-#include <list> |
#include <map> |
+#include <vector> |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/weak_ptr.h" |
#include "base/timer/timer.h" |
#include "media/audio/audio_io.h" |
#include "media/audio/audio_manager.h" |
@@ -31,8 +30,8 @@ class AudioOutputProxy; |
class MEDIA_EXPORT AudioOutputDispatcherImpl : public AudioOutputDispatcher { |
public: |
- // |close_delay_ms| specifies delay after the stream is paused until |
- // the audio device is closed. |
+ // |close_delay| specifies delay after the stream is idle until the audio |
+ // device is closed. |
AudioOutputDispatcherImpl(AudioManager* audio_manager, |
const AudioParameters& params, |
const std::string& output_device_id, |
@@ -60,38 +59,27 @@ class MEDIA_EXPORT AudioOutputDispatcherImpl : public AudioOutputDispatcher { |
virtual void Shutdown() OVERRIDE; |
private: |
- typedef std::map<AudioOutputProxy*, AudioOutputStream*> AudioStreamMap; |
friend class base::RefCountedThreadSafe<AudioOutputDispatcherImpl>; |
virtual ~AudioOutputDispatcherImpl(); |
- friend class AudioOutputProxyTest; |
- |
// Creates a new physical output stream, opens it and pushes to |
// |idle_streams_|. Returns false if the stream couldn't be created or |
// opened. |
bool CreateAndOpenStream(); |
- // A task scheduled by StartStream(). Opens a new stream and puts |
- // it in |idle_streams_|. |
- void OpenTask(); |
- |
- // Before a stream is reused, it should sit idle for a bit. This task is |
- // called once that time has elapsed. |
- void StopStreamTask(); |
+ // Closes all |idle_streams_|. |
+ void CloseIdleStreams(); |
- // Called by |close_timer_|. Closes all pending streams. |
- void ClosePendingStreams(); |
- |
- base::TimeDelta pause_delay_; |
- size_t paused_proxies_; |
- typedef std::list<AudioOutputStream*> AudioOutputStreamList; |
+ size_t idle_proxies_; |
miu
2013/10/21 23:44:36
C++ style: Should be of type 'int' (yes, even if i
DaleCurtis
2013/10/22 20:51:40
Superseded by http://www.chromium.org/developers/c
miu
2013/10/22 21:45:29
Ah! Never mind, then. I'll have to re-read the C
|
+ typedef std::vector<AudioOutputStream*> AudioOutputStreamList; |
AudioOutputStreamList idle_streams_; |
- AudioOutputStreamList pausing_streams_; |
- // Used to post delayed tasks to ourselves that we cancel inside Shutdown(). |
- base::WeakPtrFactory<AudioOutputDispatcherImpl> weak_this_; |
+ // When streams are stopped they're added to |idle_streams_|, if no stream is |
+ // reused before |close_delay_| elapses |close_timer_| will run |
+ // CloseIdleStreams(). |
base::DelayTimer<AudioOutputDispatcherImpl> close_timer_; |
+ typedef std::map<AudioOutputProxy*, AudioOutputStream*> AudioStreamMap; |
AudioStreamMap proxy_to_physical_map_; |
DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcherImpl); |