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

Unified Diff: media/filters/file_data_source.cc

Issue 155469: Splitting media filter's Initialize() into Create() + callback and Seek() + callback. (Closed)
Patch Set: Fixed valgrind errors Created 11 years, 5 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/filters/file_data_source.h ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/file_data_source.cc
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index 2e13a59e9bcfb75515e6ae5e4cce7eb3ac595edc..8ac44998fd24e6e203c086af8713ecbb5c29a482 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -20,8 +20,10 @@ FileDataSource::~FileDataSource() {
Stop();
}
-bool FileDataSource::Initialize(const std::string& url) {
+void FileDataSource::Initialize(const std::string& url,
+ FilterCallback* callback) {
DCHECK(!file_);
+ scoped_ptr<FilterCallback> c(callback);
#if defined(OS_WIN)
FilePath file_path(UTF8ToWide(url));
#else
@@ -33,15 +35,15 @@ bool FileDataSource::Initialize(const std::string& url) {
if (!file_) {
file_size_ = 0;
host()->Error(PIPELINE_ERROR_URL_NOT_FOUND);
- return false;
+ callback->Run();
+ return;
}
media_format_.SetAsString(MediaFormat::kMimeType,
mime_type::kApplicationOctetStream);
media_format_.SetAsString(MediaFormat::kURL, url);
host()->SetTotalBytes(file_size_);
host()->SetBufferedBytes(file_size_);
- host()->InitializationComplete();
- return true;
+ callback->Run();
}
void FileDataSource::Stop() {
« no previous file with comments | « media/filters/file_data_source.h ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698