Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Unified Diff: media/audio/fake_audio_output_stream.h

Issue 9692038: stopping the audio thread before destroying the AudioManager<Platform> (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the speech recognition unittest Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/fake_audio_output_stream.h
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h
index 3ea0f8bf47f98d7f570d534fdb3f76b28cbd42aa..2fef216223a5c8d34fa1a6c3adcb3599fb9a0ea6 100644
--- a/media/audio/fake_audio_output_stream.h
+++ b/media/audio/fake_audio_output_stream.h
@@ -15,10 +15,14 @@
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
+class AudioManagerBase;
+
class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
public:
- static AudioOutputStream* MakeFakeStream(const AudioParameters& params);
- static FakeAudioOutputStream* GetLastFakeStream();
+ static AudioOutputStream* MakeFakeStream(AudioManagerBase* manager,
+ const AudioParameters& params);
+
+ static FakeAudioOutputStream* GetCurrentFakeStream();
virtual bool Open() OVERRIDE;
virtual void Start(AudioSourceCallback* callback) OVERRIDE;
@@ -31,13 +35,14 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
double volume() { return volume_; }
private:
- explicit FakeAudioOutputStream(const AudioParameters& params);
+ explicit FakeAudioOutputStream(AudioManagerBase* manager,
+ const AudioParameters& params);
+
virtual ~FakeAudioOutputStream();
- static void DestroyLastFakeStream(void* param);
- static bool has_created_fake_stream_;
- static FakeAudioOutputStream* last_fake_stream_;
+ static FakeAudioOutputStream* current_fake_stream_;
+ AudioManagerBase* audio_manager_;
double volume_;
AudioSourceCallback* callback_;
scoped_array<uint8> buffer_;

Powered by Google App Engine
This is Rietveld 408576698