Simplified AudioOutputStream interface.

media/audio/win/wavein_input_win.cc

 // Copyright (c) 2010 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/win/wavein_input_win.h"
 
 #include <windows.h>
 #include <mmsystem.h>
 #pragma comment(lib, "winmm.lib")
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/win/audio_manager_win.h"
 
 namespace {
 
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
 WAVEHDR* GetNextBuffer(WAVEHDR* current) {
   return reinterpret_cast<WAVEHDR*>(current->dwUser);
 }
 
 }  // namespace
 
 PCMWaveInAudioInputStream::PCMWaveInAudioInputStream(
     AudioManagerWin* manager, AudioParameters params, int num_buffers,
-    uint32 samples_per_packet, UINT device_id)
+    UINT device_id)
     : state_(kStateEmpty),
       manager_(manager),
       device_id_(device_id),
       wavein_(NULL),
       callback_(NULL),
       num_buffers_(num_buffers),
       buffer_(NULL),
       channels_(params.channels) {
   format_.wFormatTag = WAVE_FORMAT_PCM;
   format_.nChannels = params.channels > 2 ? 2 : params.channels;
   format_.nSamplesPerSec = params.sample_rate;
   format_.wBitsPerSample = params.bits_per_sample;
   format_.cbSize = 0;
   format_.nBlockAlign = (format_.nChannels * format_.wBitsPerSample) / 8;
   format_.nAvgBytesPerSec = format_.nBlockAlign * format_.nSamplesPerSec;
-  buffer_size_ = samples_per_packet * format_.nBlockAlign;
+  buffer_size_ = params.samples_per_packet * format_.nBlockAlign;
   // If we don't have a packet size we use 100ms.
   if (!buffer_size_)
     buffer_size_ = format_.nAvgBytesPerSec / 10;
   // The event is auto-reset.
   stopped_event_.Set(::CreateEventW(NULL, FALSE, FALSE, NULL));
 }
 
 PCMWaveInAudioInputStream::~PCMWaveInAudioInputStream() {
   DCHECK(NULL == wavein_);
 }
@@ skipping 151 matching lines @@
       // waveInPrepareHeader.
       obj->QueueNextPacket(buffer);
     }
   } else if (msg == WIM_CLOSE) {
     // We can be closed before calling Start, so it is possible to have a
     // null callback at this point.
     if (obj->callback_)
       obj->callback_->OnClose(obj);
   }
 }