diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 08:33:59 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 08:33:59 +0000 |
| commit | adba07359216f215d3edb72084d0de69eac4d4a2 (patch) | |
| tree | b4f1f1ec310a436b732d9cd594176d93e31e8f27 /media/audio/cras | |
| parent | bb9d33be4be1e86a99af7f6d78a0cbc28f5c1fd9 (diff) | |
| download | chromium_src-adba07359216f215d3edb72084d0de69eac4d4a2.zip chromium_src-adba07359216f215d3edb72084d0de69eac4d4a2.tar.gz chromium_src-adba07359216f215d3edb72084d0de69eac4d4a2.tar.bz2 | |
Plumb AudioLog support into AudioManager.
AudioManager is now also an AudioLogFactory. Changing the constructor
of AudioManager isn't viable due to its psuedo-singleton behavior, so
MediaInternal's AudioLogFactory must be injected after construction.
The next step after this CL is to have AudioOutputDispatcherImpl objects
own an AudioLog instance.
BUG=260005
TEST=none, just plumbing.
Review URL: https://codereview.chromium.org/99733004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/cras')
| -rw-r--r-- | media/audio/cras/audio_manager_cras.cc | 3 | ||||
| -rw-r--r-- | media/audio/cras/audio_manager_cras.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc index 4659328..4d6edc4 100644 --- a/media/audio/cras/audio_manager_cras.cc +++ b/media/audio/cras/audio_manager_cras.cc @@ -38,7 +38,8 @@ bool AudioManagerCras::HasAudioInputDevices() { return true; } -AudioManagerCras::AudioManagerCras() { +AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory) + : AudioManagerBase(audio_log_factory) { SetMaxOutputStreamsAllowed(kMaxOutputStreams); } diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index 3b0ef53..589374a 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -15,7 +15,7 @@ namespace media { class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { public: - AudioManagerCras(); + AudioManagerCras(AudioLogFactory* audio_log_factory); // AudioManager implementation. virtual bool HasAudioOutputDevices() OVERRIDE; |