| Index: media/audio/null_audio_sink.cc
|
| diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
|
| index a77d35ea44264ef2a4fbbcf79ab09cd04632b1b1..447f28589be0445a1c37d6f7848233f626721089 100644
|
| --- a/media/audio/null_audio_sink.cc
|
| +++ b/media/audio/null_audio_sink.cc
|
| @@ -17,10 +17,19 @@ NullAudioSink::NullAudioSink()
|
| thread_("NullAudioThread") {
|
| }
|
|
|
| -NullAudioSink::~NullAudioSink() {
|
| - DCHECK(!thread_.IsRunning());
|
| - for (size_t i = 0; i < audio_data_.size(); ++i)
|
| - delete [] audio_data_[i];
|
| +void NullAudioSink::Initialize(const AudioParameters& params,
|
| + RenderCallback* callback) {
|
| + DCHECK(!initialized_);
|
| + params_ = params;
|
| +
|
| + audio_data_.reserve(params.channels());
|
| + for (int i = 0; i < params.channels(); ++i) {
|
| + float* channel_data = new float[params.frames_per_buffer()];
|
| + audio_data_.push_back(channel_data);
|
| + }
|
| +
|
| + callback_ = callback;
|
| + initialized_ = true;
|
| }
|
|
|
| void NullAudioSink::Start() {
|
| @@ -64,19 +73,10 @@ void NullAudioSink::SetPlaying(bool is_playing) {
|
| playing_ = is_playing;
|
| }
|
|
|
| -void NullAudioSink::Initialize(const AudioParameters& params,
|
| - RenderCallback* callback) {
|
| - DCHECK(!initialized_);
|
| - params_ = params;
|
| -
|
| - audio_data_.reserve(params.channels());
|
| - for (int i = 0; i < params.channels(); ++i) {
|
| - float* channel_data = new float[params.frames_per_buffer()];
|
| - audio_data_.push_back(channel_data);
|
| - }
|
| -
|
| - callback_ = callback;
|
| - initialized_ = true;
|
| +NullAudioSink::~NullAudioSink() {
|
| + DCHECK(!thread_.IsRunning());
|
| + for (size_t i = 0; i < audio_data_.size(); ++i)
|
| + delete [] audio_data_[i];
|
| }
|
|
|
| void NullAudioSink::FillBufferTask() {
|
|
|