summaryrefslogtreecommitdiffstats
path: root/media/audio/mac/audio_manager_mac.cc
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 20:11:04 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 20:11:04 +0000
commitd3dd31fb151f067389f3423ee6de09f8c5251ed9 (patch)
tree9d71cc5598bdfad7b3c0b7398002c5f4895ad1a1 /media/audio/mac/audio_manager_mac.cc
parent1ff23609a28bf25c97219b29e1ca3ca5b0d5c699 (diff)
downloadchromium_src-d3dd31fb151f067389f3423ee6de09f8c5251ed9.zip
chromium_src-d3dd31fb151f067389f3423ee6de09f8c5251ed9.tar.gz
chromium_src-d3dd31fb151f067389f3423ee6de09f8c5251ed9.tar.bz2
Rename a header and some methods to make way for subsequent audio recording additions.
Renaming audio_output.h to audio_io.h as future patches will add audio recording code to this file. Also renamed a couple of methods to make it clear that these are for audio playback/output and similar methods will be added for audio capture/recording soon. BUG=none TEST=no change in functionality. Review URL: http://codereview.chromium.org/2962006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mac/audio_manager_mac.cc')
-rw-r--r--media/audio/mac/audio_manager_mac.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index ee5943a..2cc5b39 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -9,7 +9,7 @@
#include "media/audio/mac/audio_manager_mac.h"
#include "media/audio/mac/audio_output_mac.h"
-bool AudioManagerMac::HasAudioDevices() {
+bool AudioManagerMac::HasAudioOutputDevices() {
AudioDeviceID output_device_id = kAudioObjectUnknown;
AudioObjectPropertyAddress property_address = {
kAudioHardwarePropertyDefaultOutputDevice, // mSelector
@@ -27,9 +27,11 @@ bool AudioManagerMac::HasAudioDevices() {
output_device_id != kAudioObjectUnknown;
}
-AudioOutputStream* AudioManagerMac::MakeAudioStream(Format format, int channels,
- int sample_rate,
- char bits_per_sample) {
+AudioOutputStream* AudioManagerMac::MakeAudioOutputStream(
+ Format format,
+ int channels,
+ int sample_rate,
+ char bits_per_sample) {
if (format == AUDIO_MOCK)
return FakeAudioOutputStream::MakeFakeStream();
else if (format != AUDIO_PCM_LINEAR)
@@ -47,7 +49,8 @@ void AudioManagerMac::UnMuteAll() {
}
// Called by the stream when it has been released by calling Close().
-void AudioManagerMac::ReleaseStream(PCMQueueOutAudioOutputStream* stream) {
+void AudioManagerMac::ReleaseOutputStream(
+ PCMQueueOutAudioOutputStream* stream) {
delete stream;
}