diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:12:04 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:12:04 +0000 |
| commit | 83548cfb4900fa35d3f34a88340f10d2bcce74fc (patch) | |
| tree | 4317a48420047c6c3d170d4a430743b832cc9ef9 /media/player | |
| parent | cfdae27555853c2c57f7aa91179bc39407dc77bc (diff) | |
| download | chromium_src-83548cfb4900fa35d3f34a88340f10d2bcce74fc.zip chromium_src-83548cfb4900fa35d3f34a88340f10d2bcce74fc.tar.gz chromium_src-83548cfb4900fa35d3f34a88340f10d2bcce74fc.tar.bz2 | |
Big media::Pipeline cleanup.
Before I can even start refactoring, I need to remove a lot of accumulated cruft and fix some style stuff. PipelineStatus has been merged into Pipeline and I got rid of GetInterpolatedTime() as well as the ability to schedule callbacks when time has updated. We haven't found a need for these features and they introduced a good amount of code complexity.
TEST=media_unittests should still pass
BUG=16008
Review URL: http://codereview.chromium.org/149215
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/player')
| -rw-r--r-- | media/player/movie.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/player/movie.cc b/media/player/movie.cc index 1ef840f..e37a497 100644 --- a/media/player/movie.cc +++ b/media/player/movie.cc @@ -119,7 +119,7 @@ float Movie::GetDuration() { float Movie::GetPosition() { float position = 0.f; if (pipeline_.get()) - position = (pipeline_->GetInterpolatedTime()).InMicroseconds() / 1000000.0f; + position = (pipeline_->GetTime()).InMicroseconds() / 1000000.0f; return position; } |