Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store …

content/renderer/pepper/pepper_platform_audio_output.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 "content/renderer/pepper/pepper_platform_audio_output.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 54 matching lines @@
   // the client on the main thread, and the delegates from the I/O thread.
   client_ = NULL;
   io_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&PepperPlatformAudioOutput::ShutDownOnIOThread, this));
 }
 
 void PepperPlatformAudioOutput::OnStateChanged(
     media::AudioOutputIPCDelegateState state) {}
 
+void PepperPlatformAudioOutput::OnDeviceAuthorized(
+    bool success,
+    const media::AudioParameters& output_params) {
+  NOTREACHED();
+}
+
 void PepperPlatformAudioOutput::OnStreamCreated(
     base::SharedMemoryHandle handle,
     base::SyncSocket::Handle socket_handle,
     int length) {
 #if defined(OS_WIN)
   DCHECK(handle);
   DCHECK(socket_handle);
 #else
   DCHECK(base::SharedMemory::IsHandleValid(handle));
   DCHECK_NE(-1, socket_handle);
 #endif
   DCHECK(length);
 
   if (base::ThreadTaskRunnerHandle::Get().get() == main_task_runner_.get()) {
     // Must dereference the client only on the main thread. Shutdown may have
     // occurred while the request was in-flight, so we need to NULL check.
     if (client_)
       client_->StreamCreated(handle, length, socket_handle);
   } else {
     main_task_runner_->PostTask(
         FROM_HERE, base::Bind(&PepperPlatformAudioOutput::OnStreamCreated, this,
                               handle, socket_handle, length));
   }
 }
 
 void PepperPlatformAudioOutput::OnOutputDeviceSwitched(
-    int request_id,
     media::SwitchOutputDeviceResult result) {}
 
 void PepperPlatformAudioOutput::OnIPCClosed() { ipc_.reset(); }
 
 PepperPlatformAudioOutput::~PepperPlatformAudioOutput() {
   // Make sure we have been shut down. Warning: this will usually happen on
   // the I/O thread!
   DCHECK(!ipc_);
   DCHECK(!client_);
 }
@@ skipping 24 matching lines @@
 
   io_task_runner_->PostTask(
       FROM_HERE, base::Bind(&PepperPlatformAudioOutput::InitializeOnIOThread,
                             this, params));
   return true;
 }
 
 void PepperPlatformAudioOutput::InitializeOnIOThread(
     const media::AudioParameters& params) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
-  const int kSessionId = 0;
   if (ipc_)
-    ipc_->CreateStream(this, params, kSessionId);
+    ipc_->CreateStream(this, params);
 }
 
 void PepperPlatformAudioOutput::StartPlaybackOnIOThread() {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   if (ipc_)
     ipc_->PlayStream();
 }
 
 void PepperPlatformAudioOutput::StopPlaybackOnIOThread() {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
   if (ipc_)
     ipc_->PauseStream();
 }
 
 void PepperPlatformAudioOutput::ShutDownOnIOThread() {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
 
   // Make sure we don't call shutdown more than once.
   if (!ipc_)
     return;
 
   ipc_->CloseStream();
   ipc_.reset();
 
   Release();  // Release for the delegate, balances out the reference taken in
               // PepperPlatformAudioOutput::Create.
 }
 
 }  // namespace content