Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: media/base/filters.cc

Issue 9718013: Merge FilterStatusCB into PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/filters.h ('k') | media/base/mock_filters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/filters.cc
diff --git a/media/base/filters.cc b/media/base/filters.cc
index 620b5e58140a35f310900909a8aa0ee021f85d2b..f9a85ae5aef6071e302564e8505a0fa16b0a9882 100644
--- a/media/base/filters.cc
+++ b/media/base/filters.cc
@@ -8,9 +8,9 @@
namespace media {
-void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status) {
+void ResetAndRunCB(PipelineStatusCB* cb, PipelineStatus status) {
DCHECK(!cb->is_null());
- FilterStatusCB tmp_cb(*cb);
+ PipelineStatusCB tmp_cb(*cb);
cb->Reset();
tmp_cb.Run(status);
}
@@ -63,7 +63,7 @@ void Filter::Stop(const base::Closure& callback) {
void Filter::SetPlaybackRate(float playback_rate) {}
-void Filter::Seek(base::TimeDelta time, const FilterStatusCB& callback) {
+void Filter::Seek(base::TimeDelta time, const PipelineStatusCB& callback) {
DCHECK(!callback.is_null());
callback.Run(PIPELINE_OK);
}
« no previous file with comments | « media/base/filters.h ('k') | media/base/mock_filters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698