Chromium Code Reviews| Index: media/base/filter_collection.cc |
| diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc |
| index da5042f327ffbcae9af1c0cf61bc0312f8d082a3..976611097bd5da95dcac8b0b3f2b1ac89d586d13 100644 |
| --- a/media/base/filter_collection.cc |
| +++ b/media/base/filter_collection.cc |
| @@ -4,10 +4,9 @@ |
| #include "media/base/filter_collection.h" |
| -#include "media/base/audio_renderer.h" |
| #include "media/base/demuxer.h" |
| +#include "media/base/renderer.h" |
| #include "media/base/text_renderer.h" |
| -#include "media/base/video_renderer.h" |
| namespace media { |
| @@ -23,22 +22,13 @@ Demuxer* FilterCollection::GetDemuxer() { |
| return demuxer_; |
| } |
| -void FilterCollection::SetAudioRenderer( |
| - scoped_ptr<AudioRenderer> audio_renderer) { |
| - audio_renderer_ = audio_renderer.Pass(); |
| +void FilterCollection::SetRenderer( |
|
scherkus (not reviewing)
2014/08/21 21:16:59
nit: reformat
xhwang
2014/08/22 19:11:30
Done.
|
| + scoped_ptr<Renderer> renderer) { |
| + renderer_ = renderer.Pass(); |
| } |
| -scoped_ptr<AudioRenderer> FilterCollection::GetAudioRenderer() { |
| - return audio_renderer_.Pass(); |
| -} |
| - |
| -void FilterCollection::SetVideoRenderer( |
| - scoped_ptr<VideoRenderer> video_renderer) { |
| - video_renderer_ = video_renderer.Pass(); |
| -} |
| - |
| -scoped_ptr<VideoRenderer> FilterCollection::GetVideoRenderer() { |
| - return video_renderer_.Pass(); |
| +scoped_ptr<Renderer> FilterCollection::GetRenderer() { |
| + return renderer_.Pass(); |
| } |
| void FilterCollection::SetTextRenderer( |