Renamed FilterHost::Error() and Pipeline::GetTime() to more appropriate names.

media/base/pipeline_impl.h

 // Copyright (c) 2008-2009 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.
 
 // Implementation of Pipeline.
 
 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
 #include <string>
@@ skipping 27 matching lines @@
                      PipelineCallback* start_callback);
   virtual void Stop(PipelineCallback* stop_callback);
   virtual void Seek(base::TimeDelta time, PipelineCallback* seek_callback);
   virtual bool IsRunning() const;
   virtual bool IsInitialized() const;
   virtual bool IsRendered(const std::string& major_mime_type) const;
   virtual float GetPlaybackRate() const;
   virtual void SetPlaybackRate(float playback_rate);
   virtual float GetVolume() const;
   virtual void SetVolume(float volume);
-  virtual base::TimeDelta GetTime() const;
+  virtual base::TimeDelta GetCurrentTime() const;
   virtual base::TimeDelta GetBufferedTime() const;
   virtual base::TimeDelta GetDuration() const;
   virtual int64 GetBufferedBytes() const;
   virtual int64 GetTotalBytes() const;
   virtual void GetVideoSize(size_t* width_out, size_t* height_out) const;
   virtual PipelineError GetError() const;
 
  private:
   friend class FilterHostImpl;
   friend class PipelineInternal;
@@ skipping 129 matching lines @@
   void PlaybackRateChanged(float playback_rate);
   void VolumeChanged(float volume);
 
   // Methods called by a FilterHostImpl object.  These methods may be called
   // on any thread, either the pipeline's thread or any other.
 
   // Sets the pipeline time and schedules a task to call back to any filters
   // that have registered a time update callback.
   void SetTime(base::TimeDelta time);
 
-  // Called by a FilterHostImpl on behalf of a filter calling FilterHost::Error.
-  // If the pipeline is running a nested message loop, it will be exited.
-  void Error(PipelineError error);
+  // Called by a FilterHostImpl on behalf of a filter calling
+  // FilterHost::SetError().  If the pipeline is running a nested message loop,
+  // it will be exited.
+  void SetError(PipelineError error);
 
   // Simple accessor used by the FilterHostImpl class to get access to the
   // pipeline object.
   //
   // TODO(scherkus): I think FilterHostImpl should not be talking to
   // PipelineImpl but rather PipelineInternal.
   PipelineImpl* pipeline() const { return pipeline_; }
 
   // Returns true if the pipeline has fully initialized.
   bool IsInitialized() { return state_ == kStarted; }
@@ skipping 45 matching lines @@
   // initialization to the next state. It works as a hub of state transition for
   // initialization.
   void InitializeTask();
 
   // StopTask() and ErrorTask() are similar but serve different purposes:
   //   - Both destroy the filter chain.
   //   - Both will execute |start_callback| if the pipeline was initializing.
   //   - StopTask() resets the pipeline to a fresh state, where as ErrorTask()
   //     leaves the pipeline as is for client inspection.
   //   - StopTask() can be scheduled by the client calling Stop(), where as
-  //     ErrorTask() is scheduled as a result of a filter calling Error().
+  //     ErrorTask() is scheduled as a result of a filter calling SetError().
   void StopTask(PipelineCallback* stop_callback);
   void ErrorTask(PipelineError error);
 
   // Carries out notifying filters that the playback rate/volume has changed,
   void PlaybackRateChangedTask(float playback_rate);
   void VolumeChangedTask(float volume);
 
   // Carries out notifying filters that we are seeking to a new timestamp.
   void SeekTask(base::TimeDelta time, PipelineCallback* seek_callback);
 
@@ skipping 96 matching lines @@
 
   typedef std::vector<base::Thread*> FilterThreadVector;
   FilterThreadVector filter_threads_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineInternal);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_