Chromium Code Reviews| Index: media/base/pipeline_impl.cc |
| diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc |
| index 589cd97dc20c365aabbc6e041ee41f4ada962a50..4ba050e78047c63241e6a683d4781476bb8b70c7 100644 |
| --- a/media/base/pipeline_impl.cc |
| +++ b/media/base/pipeline_impl.cc |
| @@ -64,7 +64,6 @@ class PipelineImpl::PipelineInitState { |
| PipelineImpl::PipelineImpl(MessageLoop* message_loop, MediaLog* media_log) |
| : message_loop_(message_loop), |
| media_log_(media_log), |
| - network_activity_(false), |
| clock_(new Clock(&base::Time::Now)), |
| waiting_for_clock_update_(false), |
| state_(kCreated), |
| @@ -871,10 +870,10 @@ void PipelineImpl::SeekTask(base::TimeDelta time, |
| // Suppress seeking if we're not fully started. |
| if (state_ != kStarted && state_ != kEnded) { |
| - // TODO(scherkus): should we run the callback? I'm tempted to say the API |
| - // will only execute the first Seek() request. |
| + if (!seek_callback.is_null()) |
| + seek_callback.Run(PIPELINE_ERROR_INVALID_STATE); |
|
Ami GONE FROM CHROMIUM
2011/09/13 20:12:58
Does this still get called, considering the guard
SeRya
2011/09/13 22:14:21
You are right, it's not called. Reverted that line
|
| VLOG(1) << "Media pipeline has not started, ignoring seek to " |
| - << time.InMicroseconds(); |
| + << time.InMicroseconds(); |
| return; |
| } |