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

Unified Diff: media/tools/player_x11/player_x11.cc

Issue 10855051: Use enum instead of string in MessageLoopFactory::GetMessageLoop* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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/tools/player_wtl/movie.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index e224021bd96f09a82a26619316fbc4f16848c338..8970b18042cf92f3b9ff4851ecfec08f5383519f 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -98,7 +98,7 @@ void Paint(MessageLoop* message_loop, const PaintCB& paint_cb) {
}
// TODO(vrk): Re-enabled audio. (crbug.com/112159)
-bool InitPipeline(MessageLoop* message_loop,
+bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
const scoped_refptr<media::DataSource>& data_source,
const PaintCB& paint_cb,
bool /* enable_audio */,
@@ -118,11 +118,11 @@ bool InitPipeline(MessageLoop* message_loop,
collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
base::Bind(&media::MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory),
- "AudioDecoderThread")));
+ media::MessageLoopFactory::kAudioDecoder)));
collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
base::Bind(&media::MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory),
- "VideoDecoderThread"),
+ media::MessageLoopFactory::kVideoDecoder),
NULL));
// Create our video renderer and save a reference to it for painting.
@@ -283,7 +283,7 @@ int main(int argc, char** argv) {
new DataSourceLogger(CreateFileDataSource(filename),
command_line->HasSwitch("streaming")));
- if (InitPipeline(thread->message_loop(), data_source,
+ if (InitPipeline(thread->message_loop_proxy(), data_source,
paint_cb, command_line->HasSwitch("audio"),
&pipeline, &message_loop, message_loop_factory.get())) {
// Main loop of the application.
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | media/tools/seek_tester/seek_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698