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

media/base/pipeline_impl.cc

 // 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.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "base/compiler_specific.h"
 #include "base/condition_variable.h"
 #include "base/stl_util-inl.h"
@@ skipping 152 matching lines @@
     return;
   }
 
   AutoLock auto_lock(lock_);
   volume_ = volume;
   if (pipeline_internal_) {
     pipeline_internal_->VolumeChanged(volume);
   }
 }
 
-base::TimeDelta PipelineImpl::GetTime() const {
+base::TimeDelta PipelineImpl::GetCurrentTime() const {
   AutoLock auto_lock(lock_);
   return time_;
 }
 
 base::TimeDelta PipelineImpl::GetBufferedTime() const {
   AutoLock auto_lock(lock_);
   return buffered_time_;
 }
 
 base::TimeDelta PipelineImpl::GetDuration() const {
@@ skipping 145 matching lines @@
 }
 
 // Called from any thread.  Updates the pipeline time.
 void PipelineInternal::SetTime(base::TimeDelta time) {
   // TODO(scherkus): why not post a task?
   pipeline_->SetTime(time);
 }
 
 // Called from any thread.  Sets the pipeline |error_| member and destroys all
 // filters.
-void PipelineInternal::Error(PipelineError error) {
+void PipelineInternal::SetError(PipelineError error) {
   message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &PipelineInternal::ErrorTask, error));
 }
 
 // Called from any thread.
 void PipelineInternal::OnFilterInitialize() {
   // Continue the initialize task by proceeding to the next stage.
   message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &PipelineInternal::InitializeTask));
 }
@@ skipping 87 matching lines @@
   if (state_ == kInitVideoDecoder) {
     state_ = kInitVideoRenderer;
     if (CreateRenderer<VideoDecoder, VideoRenderer>()) {
       pipeline_->InsertRenderedMimeType(VideoDecoder::major_mime_type());
       return;
     }
   }
 
   if (state_ == kInitVideoRenderer) {
     if (!IsPipelineOk() || pipeline_->rendered_mime_types_.empty()) {
-      Error(PIPELINE_ERROR_COULD_NOT_RENDER);
+      SetError(PIPELINE_ERROR_COULD_NOT_RENDER);
       return;
     }
 
     // Initialization was successful, set the volume and playback rate.
     PlaybackRateChangedTask(pipeline_->GetPlaybackRate());
     VolumeChangedTask(pipeline_->GetVolume());
 
     state_ = kStarted;
     filter_factory_ = NULL;
     if (start_callback_.get()) {
@@ skipping 118 matching lines @@
 template <class Filter, class Source>
 void PipelineInternal::CreateFilter(FilterFactory* filter_factory,
                                     Source source,
                                     const MediaFormat& media_format) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(IsPipelineOk());
 
   // Create the filter.
   scoped_refptr<Filter> filter = filter_factory->Create<Filter>(media_format);
   if (!filter) {
-    Error(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
+    SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
     return;
   }
 
   // Create a dedicated thread for this filter if applicable.
   if (SupportsSetMessageLoop<Filter>()) {
     scoped_ptr<base::Thread> thread(new base::Thread(GetThreadName<Filter>()));
     if (!thread.get() || !thread->Start()) {
       NOTREACHED() << "Could not start filter thread";
-      Error(PIPELINE_ERROR_INITIALIZATION_FAILED);
+      SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
       return;
     }
 
     filter->set_message_loop(thread->message_loop());
     filter_threads_.push_back(thread.release());
   }
 
   // Create the filter's host.
   DCHECK(IsPipelineOk());
   scoped_ptr<FilterHostImpl> host(new FilterHostImpl(this, filter.get()));
@@ skipping 120 matching lines @@
   }
 
   // Reset the pipeline, which will decrement a reference to this object.
   // We will get destroyed as soon as the remaining tasks finish executing.
   // To be safe, we'll set our pipeline reference to NULL.
   STLDeleteElements(&filter_hosts_);
   STLDeleteElements(&filter_threads_);
 }
 
 }  // namespace media