Make AudioParameters a class instead of a struct

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_output_dispatcher.h"
@@ skipping 66 matching lines @@
   // See bug: http://crbug.com/30242.
   if (num_output_streams_ >= max_num_output_streams_) {
     DLOG(ERROR) << "Number of opened output audio streams "
                 << num_output_streams_
                 << " exceed the max allowed number "
                 << max_num_output_streams_;
     return NULL;
   }
 
   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);
   }
 
   if (stream)
     ++num_output_streams_;
 
   return stream;
 }
 
 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;
   }
 
   if (num_input_streams_ >= max_num_input_streams_) {
     DLOG(ERROR) << "Number of opened input audio streams "
                 << num_input_streams_
                 << " exceed the max allowed number " << max_num_input_streams_;
     return NULL;
   }
 
   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);
   }
 
   if (stream)
     ++num_input_streams_;
 
   return stream;
 }
 
 AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
@@ skipping 87 matching lines @@
       // both physical audio stream objects that belong to the dispatcher as
       // well as the message loop of the audio thread that will soon go away.
       // So, better crash now than later.
       CHECK(dispatcher->HasOneRef()) << "AudioOutputProxies are still alive";
       dispatcher = NULL;
     }
   }
 
   output_dispatchers_.clear();
 }