summaryrefslogtreecommitdiffstats
path: root/media/base/demuxer.h
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 23:35:31 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 23:35:31 +0000
commita4dae8e1ef4fe6988bb63fcbe7184280f60e98e7 (patch)
tree8ca0f8a9bf392d37fa49ab114924441f91cfeecf /media/base/demuxer.h
parent89a985ca961f9e4bf90828f5415d3911db62a8a2 (diff)
downloadchromium_src-a4dae8e1ef4fe6988bb63fcbe7184280f60e98e7.zip
chromium_src-a4dae8e1ef4fe6988bb63fcbe7184280f60e98e7.tar.gz
chromium_src-a4dae8e1ef4fe6988bb63fcbe7184280f60e98e7.tar.bz2
Callback renaming in media code.
This is a follow up CL of 125959. - Rename AudioTimeCB and VideoTimeCB to TimeCB, as the context (VideoRenderer/AudioRenderer already provides clear context). - Rename PipelineStatusCB callback variable names to status_cb if no names with specific meaning (e.g. seek_cb) are given. - Rename foo_callback to foo_cb (except for media/audio/). Note that media/audio also contains a lot of FooCallback types and foo_callback names. This will probably be addressed in another CL. BUG=none TEST=none Review URL: http://codereview.chromium.org/9704046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/demuxer.h')
-rw-r--r--media/base/demuxer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/demuxer.h b/media/base/demuxer.h
index f049f6f..d60e793 100644
--- a/media/base/demuxer.h
+++ b/media/base/demuxer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -52,7 +52,7 @@ class MEDIA_EXPORT Demuxer
// Carry out any actions required to seek to the given time, executing the
// callback upon completion.
- virtual void Seek(base::TimeDelta time, const PipelineStatusCB& callback);
+ virtual void Seek(base::TimeDelta time, const PipelineStatusCB& status_cb);
// The pipeline is being stopped either as a result of an error or because
// the client called Stop().