SetVolume and GetVolume take one volume instead of separate left and right vo...

chrome/browser/renderer_host/audio_renderer_host.cc

 // Copyright (c) 2009 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.
 //
 // TODO(hclam): Several changes need to be made to this code:
 // 1. We should host AudioRendererHost on a dedicated audio thread. Doing
 //    so we don't have to worry about blocking method calls such as
 //    play / stop an audio stream.
 // 2. Move locked data structures into a separate structure that sanity
 //    checks access by different threads that use it.
@@ skipping 193 matching lines @@
 
   stream_->Stop();
   stream_->Close();
   // After stream is closed it is destroyed, so don't keep a reference to it.
   stream_ = NULL;
 
   // Update the current state.
   state_ = kClosed;
 }
 
-void AudioRendererHost::IPCAudioSource::SetVolume(double left, double right) {
+void AudioRendererHost::IPCAudioSource::SetVolume(double volume) {
   // TODO(hclam): maybe send an error message back to renderer if this object
   // is in a wrong state.
   if (!stream_)
     return;
-  stream_->SetVolume(left, right);
+  stream_->SetVolume(volume);
 }
 
 void AudioRendererHost::IPCAudioSource::GetVolume() {
   // TODO(hclam): maybe send an error message back to renderer if this object
   // is in a wrong state.
   if (!stream_)
     return;
-  double left_channel, right_channel;
-  stream_->GetVolume(&left_channel, &right_channel);
+  double volume;
+  stream_->GetVolume(&volume);
   host_->Send(new ViewMsg_NotifyAudioStreamVolume(route_id_, stream_id_,
-                                                  left_channel, right_channel));
+                                                  volume));
 }
 
 size_t AudioRendererHost::IPCAudioSource::OnMoreData(AudioOutputStream* stream,
                                                      void* dest,
                                                      size_t max_size,
                                                      int pending_bytes) {
   AutoLock auto_lock(lock_);
 
   // Record the callback time.
   last_callback_time_ = base::Time::Now();
@@ skipping 67 matching lines @@
     host_->Send(
         new ViewMsg_RequestAudioPacket(
             route_id_,
             stream_id_,
             buffered_bytes,
             last_callback_time_.ToInternalValue()));
   }
 }
 
 void AudioRendererHost::IPCAudioSource::SubmitPacketRequest(AutoLock* alock) {
- if (alock) {
-   SubmitPacketRequest_Locked();
- } else {
-   AutoLock auto_lock(lock_);
-   SubmitPacketRequest_Locked();
- }
+  if (alock) {
+    SubmitPacketRequest_Locked();
+  } else {
+    AutoLock auto_lock(lock_);
+    SubmitPacketRequest_Locked();
+  }
 }
 
 void AudioRendererHost::IPCAudioSource::StartBuffering() {
   SubmitPacketRequest(NULL);
 }
 
 //-----------------------------------------------------------------------------
 // AudioRendererHost implementations.
 
 AudioRendererHost::AudioRendererHost()
@@ skipping 124 matching lines @@
 
 void AudioRendererHost::OnCloseStream(const IPC::Message& msg, int stream_id) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   IPCAudioSource* source = Lookup(msg.routing_id(), stream_id);
   if (source) {
     DestroySource(source);
   }
 }
 
 void AudioRendererHost::OnSetVolume(const IPC::Message& msg, int stream_id,
-                                    double left_channel, double right_channel) {
+                                    double volume) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   IPCAudioSource* source = Lookup(msg.routing_id(), stream_id);
   if (source) {
-    source->SetVolume(left_channel, right_channel);
+    source->SetVolume(volume);
   } else {
     SendErrorMessage(msg.routing_id(), stream_id);
   }
 }
 
 void AudioRendererHost::OnGetVolume(const IPC::Message& msg, int stream_id) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   IPCAudioSource* source = Lookup(msg.routing_id(), stream_id);
   if (source) {
     source->GetVolume();
@@ skipping 80 matching lines @@
 
 void AudioRendererHost::DestroySource(IPCAudioSource* source) {
   if (ChromeThread::CurrentlyOn(ChromeThread::IO)) {
     OnDestroySource(source);
   } else {
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(this, &AudioRendererHost::OnDestroySource, source));
   }
 }