summaryrefslogtreecommitdiffstats
path: root/media/audio/pulse
diff options
context:
space:
mode:
authorjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 21:46:49 +0000
committerjrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-23 21:46:49 +0000
commitcfe9faec5f58e3f60f92ce6a83e21fc4fea20f37 (patch)
tree49c632bca74ca903647de035e127734501041b95 /media/audio/pulse
parent681e3bc77063cdd359fc3d1499d1d18216ae44aa (diff)
downloadchromium_src-cfe9faec5f58e3f60f92ce6a83e21fc4fea20f37.zip
chromium_src-cfe9faec5f58e3f60f92ce6a83e21fc4fea20f37.tar.gz
chromium_src-cfe9faec5f58e3f60f92ce6a83e21fc4fea20f37.tar.bz2
Remove unused parameter to OnError()
This change removes the error_code parameter to OnError() calls as the parameter is not used when ending up in AudioRendererHost. BUG=218641 Review URL: https://chromiumcodereview.appspot.com/12611030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
-rw-r--r--media/audio/pulse/pulse_input.cc2
-rw-r--r--media/audio/pulse/pulse_output.cc9
2 files changed, 5 insertions, 6 deletions
diff --git a/media/audio/pulse/pulse_input.cc b/media/audio/pulse/pulse_input.cc
index d5498d9..dd01428 100644
--- a/media/audio/pulse/pulse_input.cc
+++ b/media/audio/pulse/pulse_input.cc
@@ -290,7 +290,7 @@ void PulseAudioInputStream::StreamNotifyCallback(pa_stream* s,
reinterpret_cast<PulseAudioInputStream*>(user_data);
if (s && stream->callback_ &&
pa_stream_get_state(s) == PA_STREAM_FAILED) {
- stream->callback_->OnError(stream, pa_context_errno(stream->pa_context_));
+ stream->callback_->OnError(stream);
}
pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc
index 953c854..1a4b275 100644
--- a/media/audio/pulse/pulse_output.cc
+++ b/media/audio/pulse/pulse_output.cc
@@ -27,7 +27,7 @@ void PulseAudioOutputStream::ContextNotifyCallback(pa_context* c,
// should be thread safe.
if (c && stream->source_callback_ &&
pa_context_get_state(c) == PA_CONTEXT_FAILED) {
- stream->source_callback_->OnError(stream, pa_context_errno(c));
+ stream->source_callback_->OnError(stream);
}
pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
@@ -42,8 +42,7 @@ void PulseAudioOutputStream::StreamNotifyCallback(pa_stream* s, void* p_this) {
// should be thread safe.
if (s && stream->source_callback_ &&
pa_stream_get_state(s) == PA_STREAM_FAILED) {
- stream->source_callback_->OnError(
- stream, pa_context_errno(stream->pa_context_));
+ stream->source_callback_->OnError(stream);
}
pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
@@ -276,7 +275,7 @@ void PulseAudioOutputStream::FulfillWriteRequest(size_t requested_bytes) {
if (pa_stream_write(pa_stream_, buffer, bytes_to_fill, NULL, 0LL,
PA_SEEK_RELATIVE) < 0) {
if (source_callback_) {
- source_callback_->OnError(this, pa_context_errno(pa_context_));
+ source_callback_->OnError(this);
}
}
@@ -294,7 +293,7 @@ void PulseAudioOutputStream::Start(AudioSourceCallback* callback) {
// Ensure the context and stream are ready.
if (pa_context_get_state(pa_context_) != PA_CONTEXT_READY &&
pa_stream_get_state(pa_stream_) != PA_STREAM_READY) {
- callback->OnError(this, pa_context_errno(pa_context_));
+ callback->OnError(this);
return;
}