Index: remoting/host/audio_capturer_win.cc |
diff --git a/remoting/host/audio_capturer_win.cc b/remoting/host/audio_capturer_win.cc |
index 8a256454fac9362d4a5774fb85a00c1cc1cd4328..edff7c718642741ecd38e0983e0ad94c6fc2843c 100644 |
--- a/remoting/host/audio_capturer_win.cc |
+++ b/remoting/host/audio_capturer_win.cc |
@@ -8,6 +8,7 @@ |
#include <mmdeviceapi.h> |
#include <mmreg.h> |
#include <mmsystem.h> |
+#include <string> |
#include "base/basictypes.h" |
#include "base/logging.h" |
@@ -17,6 +18,7 @@ |
#include "base/win/scoped_co_mem.h" |
#include "base/win/scoped_com_initializer.h" |
#include "base/win/scoped_comptr.h" |
+#include "remoting/base/audio_capture_data.h" |
#include "remoting/host/audio_capturer.h" |
#include "remoting/proto/audio.pb.h" |
@@ -36,7 +38,7 @@ class AudioCapturerWin : public AudioCapturer { |
virtual ~AudioCapturerWin(); |
// AudioCapturer interface. |
- virtual bool Start(const PacketCapturedCallback& callback) OVERRIDE; |
+ virtual bool Start(const AudioSamplesCapturedCallback& callback) OVERRIDE; |
virtual void Stop() OVERRIDE; |
virtual bool IsRunning() OVERRIDE; |
@@ -45,7 +47,7 @@ class AudioCapturerWin : public AudioCapturer { |
// to the network. |
void DoCapture(); |
- PacketCapturedCallback callback_; |
+ AudioSamplesCapturedCallback callback_; |
AudioPacket::SamplingRate sampling_rate_; |
@@ -71,7 +73,7 @@ AudioCapturerWin::AudioCapturerWin() |
AudioCapturerWin::~AudioCapturerWin() { |
} |
-bool AudioCapturerWin::Start(const PacketCapturedCallback& callback) { |
+bool AudioCapturerWin::Start(const AudioSamplesCapturedCallback& callback) { |
DCHECK(!audio_capture_client_.get()); |
DCHECK(!audio_client_.get()); |
DCHECK(!mm_device_.get()); |
@@ -264,11 +266,14 @@ void AudioCapturerWin::DoCapture() { |
return; |
} |
- scoped_ptr<AudioPacket> packet = scoped_ptr<AudioPacket>(new AudioPacket()); |
- packet->set_data(data, frames * wave_format_ex_->nBlockAlign); |
- packet->set_sampling_rate(sampling_rate_); |
+ scoped_ptr<AudioCaptureData> capture_data = |
+ scoped_ptr<AudioCaptureData>(new AudioCaptureData()); |
+ capture_data->set_data(std::string( |
+ reinterpret_cast<const char*>(data), |
+ frames * wave_format_ex_->nBlockAlign)); |
+ capture_data->set_sampling_rate(sampling_rate_); |
- callback_.Run(packet.Pass()); |
+ callback_.Run(capture_data.Pass()); |
hr = audio_capture_client_->ReleaseBuffer(frames); |
if (FAILED(hr)) { |