diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 20:33:54 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 20:33:54 +0000 |
| commit | 86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a (patch) | |
| tree | 310a37ca44d6cab7e1e456c5b00d535c93111c92 /media/tools/player_x11/player_x11.cc | |
| parent | 32f497b982637006871eb3e32313a079909c7757 (diff) | |
| download | chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.zip chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.tar.gz chromium_src-86ea7b1013fc49cbdd6a0b7516f9b4faecd6b57a.tar.bz2 | |
Fold Pipeline::Init() into Pipeline::Start().
Instead of having clients optionally call Init() (i.e., player_x11, player_wtl) they are forced to pass null callbacks into Start().
Review URL: https://chromiumcodereview.appspot.com/9269022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11/player_x11.cc')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index ef4f126..a90ede5 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -142,7 +142,10 @@ bool InitPipeline(MessageLoop* message_loop, // Create the pipeline and start it. *pipeline = new media::Pipeline(message_loop, new media::MediaLog()); media::PipelineStatusNotification note; - (*pipeline)->Start(collection.Pass(), filename, note.Callback()); + (*pipeline)->Start( + collection.Pass(), filename, media::PipelineStatusCB(), + media::PipelineStatusCB(), media::NetworkEventCB(), + note.Callback()); // Wait until the pipeline is fully initialized. note.Wait(); |