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

media/base/composite_filter.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.
 
 #ifndef MEDIA_BASE_COMPOSITE_FILTER_H_
 #define MEDIA_BASE_COMPOSITE_FILTER_H_
 
 #include "base/task.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
@@ skipping 14 matching lines @@
   bool AddFilter(scoped_refptr<Filter> filter);
 
   // media::Filter methods.
   virtual void set_host(FilterHost* host);
   virtual FilterHost* host();
   virtual void Play(FilterCallback* play_callback);
   virtual void Pause(FilterCallback* pause_callback);
   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:
   virtual ~CompositeFilter();
 
   void SetError(PipelineStatus error);
 
  private:
   class FilterHostImpl;
 
@@ skipping 54 matching lines @@
 
   // Helper function used by NewThreadSafeCallback() to make sure the
   // method gets called on the right thread.
   static void OnCallback(MessageLoop* message_loop,
                          CancelableTask* task);
 
   // Helper function that indicates whether SetError() calls can be forwarded
   // 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_;
 
   // Current state of this filter.
   State state_;
 
   // The index of the filter currently processing a request.
   unsigned int sequence_index_;
 
   // Message loop passed into the constructor.
   MessageLoop* message_loop_;
 
   // FilterHost implementation passed to Filters owned by this
   // object.
   scoped_ptr<FilterHostImpl> host_impl_;
 
   // PIPELINE_OK, or last error passed to SetError().
   PipelineStatus status_;
 
   scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_COMPOSITE_FILTER_H_