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

Unified Diff: media/audio/audio_manager_base.cc

Issue 9655018: Make AudioParameters a class instead of a struct (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright years 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
« no previous file with comments | « media/audio/audio_input_volume_unittest.cc ('k') | media/audio/audio_output_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index abe31dcaa5e8fd0127457cd74f13f046a3bf7e5c..89191af5f8c574dd8fa2b64b0617f4450cd9f840 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -84,11 +84,11 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
}
AudioOutputStream* stream = NULL;
- if (params.format == AudioParameters::AUDIO_MOCK) {
+ if (params.format() == AudioParameters::AUDIO_MOCK) {
stream = FakeAudioOutputStream::MakeFakeStream(this, params);
- } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
+ } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
stream = MakeLinearOutputStream(params);
- } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
stream = MakeLowLatencyOutputStream(params);
}
@@ -100,7 +100,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
AudioInputStream* AudioManagerBase::MakeAudioInputStream(
const AudioParameters& params, const std::string& device_id) {
- if (!params.IsValid() || (params.channels > kMaxInputChannels) ||
+ if (!params.IsValid() || (params.channels() > kMaxInputChannels) ||
device_id.empty()) {
DLOG(ERROR) << "Audio parameters are invalid for device " << device_id;
return NULL;
@@ -114,11 +114,11 @@ AudioInputStream* AudioManagerBase::MakeAudioInputStream(
}
AudioInputStream* stream = NULL;
- if (params.format == AudioParameters::AUDIO_MOCK) {
+ if (params.format() == AudioParameters::AUDIO_MOCK) {
stream = FakeAudioInputStream::MakeFakeStream(this, params);
- } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
+ } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
stream = MakeLinearInputStream(params, device_id);
- } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
stream = MakeLowLatencyInputStream(params, device_id);
}
« no previous file with comments | « media/audio/audio_input_volume_unittest.cc ('k') | media/audio/audio_output_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698