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

media/base/composite_filter.h

Index: media/base/composite_filter.h
diff --git a/media/base/composite_filter.h b/media/base/composite_filter.h
index a2c8c0939ad7838de7c9503278eaaee08d787e7f..2eff9906a05687e28ff7c9897097adf2dac9c245 100644
--- a/media/base/composite_filter.h
+++ b/media/base/composite_filter.h
@@ -32,7 +32,7 @@ class CompositeFilter : public Filter {
   virtual void Flush(FilterCallback* flush_callback);
   virtual void Stop(FilterCallback* stop_callback);
   virtual void SetPlaybackRate(float playback_rate);
-  virtual void Seek(base::TimeDelta time, FilterCallback* seek_callback);
+  virtual void Seek(base::TimeDelta time, const FilterStatusCB& seek_cb);
   virtual void OnAudioRendererDisabled();
 
  protected:
@@ -107,12 +107,19 @@ class CompositeFilter : public Filter {
   // to the host of this filter.
   bool CanForwardError();
 
+  bool IsOperationPending() const;

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

doco

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

Done.

+
+  // Called by operations that take a FilterStatusCB instead of a
+  // FilterCallback.

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

TODO to remove when FilterCallback goes away?

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

Done.

+  void OnStatusCB(FilterCallback* callback, PipelineStatus status);
+
   // Vector of the filters added to the composite.
   typedef std::vector<scoped_refptr<Filter> > FilterVector;
   FilterVector filters_;
 
   // Callback for the pending request.
   scoped_ptr<FilterCallback> callback_;
+  FilterStatusCB status_cb_;

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

Yowza; either can be non-null?  Seems like a TODO to remove callback_ is in
order?

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

Yes. One or the other will be non-null, but not both. Added a TODO

 
   // Time parameter for the pending Seek() request.
   base::TimeDelta pending_seek_time_;