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

Unified Diff: media/audio/audio_manager_base.h

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: rebase Created 3 years, 7 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
« no previous file with comments | « media/audio/audio_manager.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.h
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 38748c567be65d60f6e2bc08ab4cd6504d480e52..516a1765edef774a94db56ad8c3343e370d55033 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -94,12 +94,11 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
int output_stream_count() const { return num_output_streams_; }
protected:
- AudioManagerBase(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
- AudioLogFactory* audio_log_factory);
+ AudioManagerBase(std::unique_ptr<AudioThread> audio_thread,
+ AudioLogFactory* audio_log_factory);
// AudioManager:
+ void ShutdownOnAudioThread() override;
base::string16 GetAudioInputDeviceModel() override;
void ShowAudioInputSettings() override;
@@ -116,12 +115,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
std::string GetAssociatedOutputDeviceID(
const std::string& input_device_id) override;
- // Releases all the audio output dispatchers.
- // All audio streams should be closed before Shutdown() is called.
- // This must be called in the destructor of every AudioManagerBase
- // implementation.
- void Shutdown();
-
void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
// Called by each platform specific AudioManager to notify output state change
« no previous file with comments | « media/audio/audio_manager.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698