Convert Filter::Seek() to use new callback system.

media/base/filters.cc

 // Copyright (c) 2011 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/base/filters.h"
 
 #include "base/logging.h"
 
 namespace media {
 
+FilterStatusCB CopyAndResetCB(FilterStatusCB& cb) {
+  FilterStatusCB ret(cb);
+  cb.Reset();
+  return ret;
+}
 Filter::Filter() : host_(NULL) {}
 
 Filter::~Filter() {}
 
 void Filter::set_host(FilterHost* host) {
   DCHECK(host);
   DCHECK(!host_);
   host_ = host;
 }
 
@@ skipping 28 matching lines @@
 void Filter::Stop(FilterCallback* callback) {
   DCHECK(callback);
   if (callback) {
     callback->Run();
     delete callback;
   }
 }
 
 void Filter::SetPlaybackRate(float playback_rate) {}
 
-void Filter::Seek(base::TimeDelta time, FilterCallback* callback) {
-  scoped_ptr<FilterCallback> seek_callback(callback);
-  if (seek_callback.get()) {
-    seek_callback->Run();
-  }
+void Filter::Seek(base::TimeDelta time, const FilterStatusCB& callback) {
+  DCHECK(!callback.is_null());
+  if (!callback.is_null())

[Ami GONE FROM CHROMIUM, 2011/05/12 20:42:16]

I don't understand the DCHECK+if.
Is there a missing TODO here?

[acolwell GONE FROM CHROMIUM, 2011/05/12 22:30:40]

I was just making it match the other methods. I'll remove the if here and in the
other methods.

+      callback.Run(PIPELINE_OK);

[Ami GONE FROM CHROMIUM, 2011/05/12 20:42:16]

outdent

[acolwell GONE FROM CHROMIUM, 2011/05/12 22:30:40]

Done.

 }
 
 void Filter::OnAudioRendererDisabled() {
 }
 
 AVStream* DemuxerStream::GetAVStream() {
   return NULL;
 }
 
 DemuxerStream::~DemuxerStream() {}
 
 VideoDecoder::VideoDecoder() {}
 
 VideoDecoder::~VideoDecoder() {}
 
 AudioDecoder::AudioDecoder() {}
 
 AudioDecoder::~AudioDecoder() {}
 
 void AudioDecoder::ConsumeAudioSamples(scoped_refptr<Buffer> buffer) {
   consume_audio_samples_callback_.Run(buffer);
 }
 
 }  // namespace media