Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: media/audio/audio_manager_base.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_input_controller_unittest.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 310e4be16498d5501b74f59f9a1b4d17f46ee577..07c56b6e4c0fe9f1c604ccea605bac16cec751e7 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -204,7 +204,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
AudioOutputDispatchersMap::iterator it =
output_dispatchers_.find(dispatcher_key);
if (it != output_dispatchers_.end())
- return new AudioOutputProxy(it->second);
+ return new AudioOutputProxy(it->second.get());
const base::TimeDelta kCloseDelay =
base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
@@ -213,13 +213,13 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
scoped_refptr<AudioOutputDispatcher> dispatcher =
new AudioOutputResampler(this, params, output_params, kCloseDelay);
output_dispatchers_[dispatcher_key] = dispatcher;
- return new AudioOutputProxy(dispatcher);
+ return new AudioOutputProxy(dispatcher.get());
}
scoped_refptr<AudioOutputDispatcher> dispatcher =
new AudioOutputDispatcherImpl(this, output_params, kCloseDelay);
output_dispatchers_[dispatcher_key] = dispatcher;
- return new AudioOutputProxy(dispatcher);
+ return new AudioOutputProxy(dispatcher.get());
#endif // defined(OS_IOS)
}
@@ -295,7 +295,7 @@ void AudioManagerBase::ShutdownOnAudioThread() {
AudioOutputDispatchersMap::iterator it = output_dispatchers_.begin();
for (; it != output_dispatchers_.end(); ++it) {
scoped_refptr<AudioOutputDispatcher>& dispatcher = (*it).second;
- if (dispatcher) {
+ if (dispatcher.get()) {
dispatcher->Shutdown();
// All AudioOutputProxies must have been freed before Shutdown is called.
// If they still exist, things will go bad. They have direct pointers to
« no previous file with comments | « media/audio/audio_input_controller_unittest.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698