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

Unified Diff: chrome/browser/chromeos/audio/audio_mixer_alsa.h

Issue 11358083: Decouple c/b/cros/audio from c/b/speech. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « chrome/browser/chromeos/audio/audio_mixer.h ('k') | chrome/browser/chromeos/audio/audio_mixer_alsa.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/audio/audio_mixer_alsa.h
diff --git a/chrome/browser/chromeos/audio/audio_mixer_alsa.h b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
index c954d2ef3b258ac96ac00c0dd9207c54bffb59da..204b6d1ed132821e88335436bc476ff1bd4eb4ac 100644
--- a/chrome/browser/chromeos/audio/audio_mixer_alsa.h
+++ b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
@@ -28,7 +28,7 @@ class AudioMixerAlsa : public AudioMixer {
virtual ~AudioMixerAlsa();
// AudioMixer implementation.
- virtual void Init() OVERRIDE;
+ virtual void Init(const base::Closure& on_connected) OVERRIDE;
virtual double GetVolumePercent() OVERRIDE;
virtual void SetVolumePercent(double percent) OVERRIDE;
virtual bool IsMuted() OVERRIDE;
@@ -43,12 +43,12 @@ class AudioMixerAlsa : public AudioMixer {
private:
// Tries to connect to ALSA. On failure, posts a delayed Connect() task to
// try again.
- void Connect();
+ void Connect(const base::Closure& on_connected);
// Helper method called by Connect(). On success, initializes
// |min_volume_db_|, |max_volume_db_|, |alsa_mixer_|, and |element_*| and
// returns true.
- bool ConnectInternal();
+ bool ConnectInternal(const base::Closure& on_connected);
// Disconnects from ALSA if currently connected and signals
// |disconnected_event_|.
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer.h ('k') | chrome/browser/chromeos/audio/audio_mixer_alsa.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698