diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 20:46:46 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 20:46:46 +0000 |
| commit | b572562659e2b46d99ee2a049e57f5d3dd28e0a7 (patch) | |
| tree | b9bd76097d46ca3073528c5d30c42446963c21b6 /media/base/pipeline_impl.h | |
| parent | 2e6707f57abfe9a98bf5d9c931defc2efd12e483 (diff) | |
| download | chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.zip chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.tar.gz chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.tar.bz2 | |
Revert "Pipeline will execute a callback whenever an run-time error has happened."
TBR=kylep
Review URL: http://codereview.chromium.org/160287
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl.h')
| -rw-r--r-- | media/base/pipeline_impl.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index 5c84e26..02c8bce 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -7,10 +7,9 @@ #ifndef MEDIA_BASE_PIPELINE_IMPL_H_ #define MEDIA_BASE_PIPELINE_IMPL_H_ -#include <map> -#include <set> #include <string> #include <vector> +#include <set> #include "base/message_loop.h" #include "base/ref_counted.h" @@ -84,11 +83,6 @@ class PipelineImpl : public Pipeline, public FilterHost { virtual void GetVideoSize(size_t* width_out, size_t* height_out) const; virtual PipelineError GetError() const; - // |error_callback_| will be executed upon an error in the pipeline. If - // |error_callback_| is NULL, it is ignored. The pipeline takes ownernship - // of |error_callback|. - virtual void SetPipelineErrorCallback(PipelineCallback* error_callback); - private: // Pipeline states, as described above. enum State { @@ -323,7 +317,6 @@ class PipelineImpl : public Pipeline, public FilterHost { // Callbacks for various pipeline operations. scoped_ptr<PipelineCallback> seek_callback_; scoped_ptr<PipelineCallback> stop_callback_; - scoped_ptr<PipelineCallback> error_callback_; // Vector of our filters and map maintaining the relationship between the // FilterType and the filter itself. |