summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 23:57:23 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 23:57:23 +0000
commitcea25d5216c226cfc55c56ccff3e9626878b7c80 (patch)
tree1414b9588743b478c867b96c4f0a1dde34bc9412 /chrome
parentdb99c1b50a8b39899e425a4860cfa03348a68795 (diff)
downloadchromium_src-cea25d5216c226cfc55c56ccff3e9626878b7c80.zip
chromium_src-cea25d5216c226cfc55c56ccff3e9626878b7c80.tar.gz
chromium_src-cea25d5216c226cfc55c56ccff3e9626878b7c80.tar.bz2
Made MediaFilter::host_ and MediaFilter::message_loop_ private.
More cleanup relating to pipeline cleanup. BUG=16008 TEST=no real code chage, nothing should change Review URL: http://codereview.chromium.org/155230 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/media/audio_renderer_impl.cc2
-rw-r--r--chrome/renderer/media/buffered_data_source.cc16
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/renderer/media/audio_renderer_impl.cc b/chrome/renderer/media/audio_renderer_impl.cc
index 73f2320..cdee03c 100644
--- a/chrome/renderer/media/audio_renderer_impl.cc
+++ b/chrome/renderer/media/audio_renderer_impl.cc
@@ -194,7 +194,7 @@ void AudioRendererImpl::OnStateChanged(AudioOutputStream::State state,
switch (state) {
case AudioOutputStream::STATE_ERROR:
- host_->Error(media::PIPELINE_ERROR_AUDIO_HARDWARE);
+ host()->Error(media::PIPELINE_ERROR_AUDIO_HARDWARE);
break;
// TODO(hclam): handle these events.
case AudioOutputStream::STATE_STARTED:
diff --git a/chrome/renderer/media/buffered_data_source.cc b/chrome/renderer/media/buffered_data_source.cc
index ef92ce1..ef987a5 100644
--- a/chrome/renderer/media/buffered_data_source.cc
+++ b/chrome/renderer/media/buffered_data_source.cc
@@ -538,7 +538,7 @@ bool BufferedDataSource::Initialize(const std::string& url) {
// Make sure we support the scheme of the URL.
if (!IsSchemeSupported(url_)) {
- host_->Error(media::PIPELINE_ERROR_NETWORK);
+ host()->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
@@ -565,12 +565,12 @@ bool BufferedDataSource::Initialize(const std::string& url) {
if (resource_loader) {
if (net::ERR_IO_PENDING != resource_loader->Start(
NewCallback(this, &BufferedDataSource::InitialRequestStarted))) {
- host_->Error(media::PIPELINE_ERROR_NETWORK);
+ host()->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
return true;
}
- host_->Error(media::PIPELINE_ERROR_NETWORK);
+ host()->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
@@ -671,7 +671,7 @@ bool BufferedDataSource::IsSeekable() {
void BufferedDataSource::HandleError(media::PipelineError error) {
AutoLock auto_lock(lock_);
if (!stopped_) {
- host_->Error(error);
+ host()->Error(error);
}
}
@@ -695,13 +695,13 @@ void BufferedDataSource::OnInitialRequestStarted(int error) {
if (error == net::OK) {
total_bytes_ = buffered_resource_loader_->content_length();
if (IsSeekable()) {
- host_->SetTotalBytes(total_bytes_);
+ host()->SetTotalBytes(total_bytes_);
// TODO(hclam): report the amount of bytes buffered accurately.
- host_->SetBufferedBytes(total_bytes_);
+ host()->SetBufferedBytes(total_bytes_);
}
- host_->InitializationComplete();
+ host()->InitializationComplete();
} else {
- host_->Error(media::PIPELINE_ERROR_NETWORK);
+ host()->Error(media::PIPELINE_ERROR_NETWORK);
}
}
}