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

media/filters/decoder_base.h

 // 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.
 
 // A base class that provides the plumbing for a decoder filters.
 
 #ifndef MEDIA_FILTERS_DECODER_BASE_H_
 #define MEDIA_FILTERS_DECODER_BASE_H_
 
 #include <deque>
@@ skipping 16 matching lines @@
 template <class Decoder, class Output>
 class DecoderBase : public Decoder {
  public:
   // Filter implementation.
   virtual void Stop(FilterCallback* callback) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::StopTask, callback));
   }
 
-  virtual void Seek(base::TimeDelta time,
-                    FilterCallback* callback) {
+  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) {
     message_loop_->PostTask(
         FROM_HERE,
-        NewRunnableMethod(this, &DecoderBase::SeekTask, time, callback));
+        NewRunnableMethod(this, &DecoderBase::SeekTask, time, cb));
   }
 
   // Decoder implementation.
   virtual void Initialize(DemuxerStream* demuxer_stream,
                           FilterCallback* callback,
                           StatisticsCallback* stats_callback) {
     statistics_callback_.reset(stats_callback);
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this,
@@ skipping 111 matching lines @@
     // Throw away all buffers in all queues.
     result_queue_.clear();
     state_ = kStopped;
 
     if (callback) {
       callback->Run();
       delete callback;
     }
   }
 
-  void SeekTask(base::TimeDelta time, FilterCallback* callback) {
+  void SeekTask(base::TimeDelta time, const FilterStatusCB& cb) {
     DCHECK_EQ(MessageLoop::current(), message_loop_);
     DCHECK_EQ(0u, pending_reads_) << "Pending reads should have completed";
     DCHECK_EQ(0u, pending_requests_) << "Pending requests should be empty";
 
     // Delegate to the subclass first.
-    DoSeek(time,
-           NewRunnableMethod(this, &DecoderBase::OnSeekComplete, callback));
+    DoSeek(time, NewRunnableMethod(this, &DecoderBase::OnSeekComplete, cb));
   }
 
-  void OnSeekComplete(FilterCallback* callback) {
+  void OnSeekComplete(const FilterStatusCB& cb) {
     // Flush our decoded results.
     result_queue_.clear();
 
     // Signal that we're done seeking.
-    if (callback) {
-      callback->Run();
-      delete callback;
-    }
+    if (!cb.is_null())
+      cb.Run(PIPELINE_OK);
   }
 
   void InitializeTask(DemuxerStream* demuxer_stream,
                       FilterCallback* callback) {
     DCHECK_EQ(MessageLoop::current(), message_loop_);
     CHECK(kUninitialized == state_);
     CHECK(!demuxer_stream_);
     demuxer_stream_ = demuxer_stream;
 
     bool* success = new bool;
@@ skipping 104 matching lines @@
 
   // Callback to update pipeline statistics.
   scoped_ptr<StatisticsCallback> statistics_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_BASE_H_