summaryrefslogtreecommitdiffstats
path: root/media/audio/linux/pulse_output.h
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 22:36:38 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 22:36:38 +0000
commitadabb62712f972e63fb19afc727093b2008d82ad (patch)
treeb384d924ec7531cc9efb7432d290a8b0ab593845 /media/audio/linux/pulse_output.h
parent4a338b43f6ecc9e030c9cd177e90f3308ea7fdd4 (diff)
downloadchromium_src-adabb62712f972e63fb19afc727093b2008d82ad.zip
chromium_src-adabb62712f972e63fb19afc727093b2008d82ad.tar.gz
chromium_src-adabb62712f972e63fb19afc727093b2008d82ad.tar.bz2
Convert all of media/ over to the new base::{Bind,Callback} hotness.
Mostly this was a rote conversion, replacing: - Pass-by-pointer CallbackN<>'s become pass-by-const-ref Callback<>'s. - scoped_ptr<CallbackN<>> members become Callback<> members. - several dedicated FooCallback typedefs became base::Closure. Because it was only used in a small handful of places and only in one place profitably, I deleted AutoCallbackRunner. Because it tickles a Bind bug I disabled mfdecoder in .gyp (about to get deleted in a scherkus CL). BUG=none TEST=media_tests, trybots Review URL: http://codereview.chromium.org/8071007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/linux/pulse_output.h')
-rw-r--r--media/audio/linux/pulse_output.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/audio/linux/pulse_output.h b/media/audio/linux/pulse_output.h
index 7da9228..46aab57 100644
--- a/media/audio/linux/pulse_output.h
+++ b/media/audio/linux/pulse_output.h
@@ -22,6 +22,7 @@
#include <pulse/pulseaudio.h>
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/task.h"
#include "media/audio/audio_io.h"
#include "media/base/channel_layout.h"
@@ -119,7 +120,7 @@ class PulseAudioOutputStream : public AudioOutputStream {
// Allows us to run tasks on the PulseAudioOutputStream instance which are
// bound by its lifetime.
- ScopedRunnableMethodFactory<PulseAudioOutputStream> method_factory_;
+ base::WeakPtrFactory<PulseAudioOutputStream> weak_factory_;
// Callback to audio data source.
AudioSourceCallback* source_callback_;