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

Unified Diff: chrome/browser/chromeos/audio_mixer.h

Issue 5859003: Add ALSA support to volume keys (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos
Patch Set: using snd_mixer_selem_id_malloc Created 9 years, 11 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
Index: chrome/browser/chromeos/audio_mixer.h
diff --git a/chrome/browser/chromeos/audio_mixer.h b/chrome/browser/chromeos/audio_mixer.h
new file mode 100644
index 0000000000000000000000000000000000000000..d19c7ea3ce6680b602ebf6945172bf530e5d8310
--- /dev/null
+++ b/chrome/browser/chromeos/audio_mixer.h
@@ -0,0 +1,67 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
+#define CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/callback.h"
+
+namespace chromeos {
+
+class AudioMixer {
+ public:
+ enum State {
+ UNINITIALIZED = 0,
+ INITIALIZING,
+ READY,
+ SHUTTING_DOWN,
+ IN_ERROR,
+ };
+
+ AudioMixer() {}
scherkus (not reviewing) 2011/01/11 00:24:12 don't inline ctors / dtors (might have to write a
davejcool 2011/01/11 02:52:54 The style guide says it is fine to inline virtual
+ virtual ~AudioMixer() {}
+
+ // Non-Blocking call. Connect to Mixer, find a default device, then call the
+ // callback when complete with success code.
+ typedef Callback1<bool>::Type InitDoneCallback;
+ virtual bool Init(InitDoneCallback* callback) = 0;
scherkus (not reviewing) 2011/01/11 00:24:12 I'm inclined to say either use the callback to rep
davejcool 2011/01/11 02:52:54 Thanks, done.
+
+ // Call may block. Mixer will be connected before returning, unless error.
+ virtual bool InitSync() = 0;
scherkus (not reviewing) 2011/01/11 00:24:12 we can consider deferring to a later change but I'
davejcool 2011/01/11 02:52:54 I like the idea- it would simplify the AudioMixer
+
+ // Call may block. Returns a default of kSilenceDb on error.
+ virtual double GetVolumeDb() const = 0;
+
+ // Non-Blocking call. Returns the actual volume limits possible according
+ // to the mixer. Limits are left unchanged on error
+ virtual bool GetVolumeLimits(double* vol_min, double* vol_max) = 0;
+
+ // Non-blocking call.
+ virtual void SetVolumeDb(double vol_db) = 0;
+
+ // Call may block. Gets the mute state of the default device (true == mute).
+ // Returns a default of false on error.
+ virtual bool IsMute() const = 0;
+
+ // Non-Blocking call.
+ virtual void SetMute(bool mute) = 0;
+
+ // Returns READY if we have a valid working connection to the Mixer.
+ // This can return IN_ERROR if we lose the connection, even after an original
+ // successful init. Non-blocking call.
+ virtual State CheckState() const = 0;
scherkus (not reviewing) 2011/01/11 00:24:12 nit: I think this used to be called CheckState() b
davejcool 2011/01/11 02:52:54 Yes, GetState() Now makes more sense.
+
+ // Approximation of pure silence expressed in decibels.
+ static const double kSilenceDb = -200.0;
scherkus (not reviewing) 2011/01/11 00:24:12 constants at top of class declarations + move the
davejcool 2011/01/11 02:52:54 Moved to the top where it belongs. I've seen cons
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(AudioMixer);
+};
+
+} // namespace chromeos
+
+#endif // CHROME_BROWSER_CHROMEOS_AUDIO_MIXER_H_
+

Powered by Google App Engine
This is Rietveld 408576698