Merge FilterStatusCB into PipelineStatusCB.

media/filters/audio_renderer_base.h

 // Copyright (c) 2012 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.
 
 // AudioRendererBase takes care of the tricky queuing work and provides simple
 // methods for subclasses to peek and poke at audio data.  In addition to
 // AudioRenderer interface methods this classes doesn't implement, subclasses
 // must also implement the following methods:
 //   OnInitialized
 //   OnStop
@@ skipping 21 matching lines @@
 class MEDIA_EXPORT AudioRendererBase : public AudioRenderer {
  public:
   AudioRendererBase();
   virtual ~AudioRendererBase();
 
   // Filter implementation.
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
+  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
 
   // AudioRenderer implementation.
   virtual void Initialize(const scoped_refptr<AudioDecoder>& decoder,
                           const PipelineStatusCB& init_cb,
                           const base::Closure& underflow_cb,
                           const TimeCB& time_cb) OVERRIDE;
   virtual bool HasEnded() OVERRIDE;
   virtual void ResumeAfterUnderflow(bool buffer_more_audio) OVERRIDE;
 
  protected:
@@ skipping 94 matching lines @@
   // Keeps track of whether we received and rendered the end of stream buffer.
   bool received_end_of_stream_;
   bool rendered_end_of_stream_;
 
   // Audio time at end of last call to FillBuffer().
   // TODO(ralphl): Update this value after seeking.
   base::TimeDelta last_fill_buffer_time_;
 
   // Filter callbacks.
   base::Closure pause_cb_;
-  FilterStatusCB seek_cb_;
+  PipelineStatusCB seek_cb_;
 
   base::Closure underflow_cb_;
 
   TimeCB time_cb_;
 
   base::TimeDelta seek_timestamp_;
 
   uint32 bytes_per_frame_;
 
   AudioDecoder::ReadCB read_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_