Add ALSA support to volume keys

chrome/browser/chromeos/audio_handler.h

 // 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_HANDLER_H_
 #define CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
+#include "base/thread.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
 namespace chromeos {
 
-class PulseAudioMixer;
+class AudioMixerBase;
 
 class AudioHandler {
  public:
   static AudioHandler* instance();
 
   // Get volume level in our internal 0-100% range, 0 being pure silence.
   // Volume may go above 100% if another process changes PulseAudio's volume.
   // Returns default of 0 on error.  This function will block until the volume
   // is retrieved or fails.  Blocking call.
   double GetVolumePercent();
 
   // Set volume level from 0-100%.  Volumes above 100% are OK and boost volume,
   // although clipping will occur more at higher volumes.  Volume gets quieter
   // as the percentage gets lower, and then switches to silence at 0%.
   void SetVolumePercent(double volume_percent);
 
-  // Adust volume up (positive percentage) or down (negative percentage),
+  // Adjust volume up (positive percentage) or down (negative percentage),
   // capping at 100%.  GetVolumePercent() will be accurate after this
   // blocking call.
   void AdjustVolumeByPercent(double adjust_by_percent);
 
   // Just returns true if mute, false if not or an error occurred.
   // Blocking call.
   bool IsMute();
 
   // Mutes all audio.  Non-blocking call.
   void SetMute(bool do_mute);
 
  private:
   // Defines the delete on exit Singleton traits we like.  Best to have this
   // and constructor/destructor private as recommended for Singletons.
   friend struct DefaultSingletonTraits<AudioHandler>;
 
+  // Connect to the current using_mixer_.
+  bool TryToConnect(bool async);
+
   void OnMixerInitialized(bool success);
 
   AudioHandler();
   virtual ~AudioHandler();
   bool VerifyMixerConnection();
 
   // Conversion between our internal scaling (0-100%) and decibels.
-  static double VolumeDbToPercent(double volume_db);
-  static double PercentToVolumeDb(double volume_percent);
+  double VolumeDbToPercent(double volume_db) const;
+  double PercentToVolumeDb(double volume_percent) const;
 
-  scoped_ptr<PulseAudioMixer> mixer_;
+  scoped_ptr<AudioMixerBase> mixer_;
+
   bool connected_;
   int reconnect_tries_;
 
+  // The min and max volume in decibels, limited to the maximum range of the
+  // audio system being used.
+  double max_volume_db_;
+  double min_volume_db_;
+
+  // Which mixer is being used, PulseAudio or ALSA
+  int using_mixer_;

[Daniel Erat, 2010/12/20 22:01:12]

use an enum instead, e.g. MixerType with MIXER_TYPE_PULSE_AUDIO and
MIXER_TYPE_ALSA values

[davejcool, 2010/12/21 02:00:21]

Funny, I went back and forth on that one... but it will make things clearer,
even if it does create more lines than just doing "++using_mixer".

+
   DISALLOW_COPY_AND_ASSIGN(AudioHandler);
 };
 
 }  // namespace chromeos
 
+DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::AudioHandler);
+
 #endif  // CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_