Index: chromeos/dbus/cras_audio_client.h |
diff --git a/chromeos/dbus/cras_audio_client.h b/chromeos/dbus/cras_audio_client.h |
index 4b2d7eb37727e38efbd964d502ebed0ef7539f21..0eff85d66203e46469ace78d5022aaf3df4831de 100644 |
--- a/chromeos/dbus/cras_audio_client.h |
+++ b/chromeos/dbus/cras_audio_client.h |
@@ -5,7 +5,10 @@ |
#ifndef CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_H_ |
#define CHROMEOS_DBUS_CRAS_AUDIO_CLIENT_H_ |
+#include <stdint.h> |
+ |
#include "base/callback.h" |
+#include "base/macros.h" |
#include "base/observer_list.h" |
#include "chromeos/chromeos_export.h" |
#include "chromeos/dbus/audio_node.h" |
@@ -34,10 +37,10 @@ class CHROMEOS_EXPORT CrasAudioClient : public DBusClient { |
virtual void NodesChanged(); |
// Called when active audio output node changed to new node with |node_id|. |
- virtual void ActiveOutputNodeChanged(uint64 node_id); |
+ virtual void ActiveOutputNodeChanged(uint64_t node_id); |
// Called when active audio input node changed to new node with |node_id|. |
- virtual void ActiveInputNodeChanged(uint64 node_id); |
+ virtual void ActiveInputNodeChanged(uint64_t node_id); |
protected: |
virtual ~Observer(); |
@@ -77,50 +80,50 @@ class CHROMEOS_EXPORT CrasAudioClient : public DBusClient { |
// Sets output volume of the given |node_id| to |volume|, in the rage of |
// [0, 100]. |
- virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) = 0; |
+ virtual void SetOutputNodeVolume(uint64_t node_id, int32_t volume) = 0; |
// Sets output mute from user action. |
virtual void SetOutputUserMute(bool mute_on) = 0; |
// Sets input gain of the given |node_id| to |gain|, in the range of |
// [0, 100]. |
- virtual void SetInputNodeGain(uint64 node_id, int32 gain) = 0; |
+ virtual void SetInputNodeGain(uint64_t node_id, int32_t gain) = 0; |
// Sets input mute state to |mute_on| value. |
virtual void SetInputMute(bool mute_on) = 0; |
// Sets the active output node to |node_id|. |
- virtual void SetActiveOutputNode(uint64 node_id) = 0; |
+ virtual void SetActiveOutputNode(uint64_t node_id) = 0; |
// Sets the primary active input node to |node_id|. |
- virtual void SetActiveInputNode(uint64 node_id) = 0; |
+ virtual void SetActiveInputNode(uint64_t node_id) = 0; |
// Adds input node |node_id| to the active input list. This is used to add |
// an additional active input node besides the one set by SetActiveInputNode. |
// Note that this action will not trigger an ActiveInputNodeChanged event and |
// nothing will happen if the |node_id| has already been set as active. |
- virtual void AddActiveInputNode(uint64 node_id) = 0; |
+ virtual void AddActiveInputNode(uint64_t node_id) = 0; |
// Removes input node |node_id| from the active input list. This is used for |
// removing an active input node added by AddActiveInputNode. |
- virtual void RemoveActiveInputNode(uint64 node_id) = 0; |
+ virtual void RemoveActiveInputNode(uint64_t node_id) = 0; |
// Adds input node |node_id| to the active outputs list. This is used to add |
// an additional active output node besides the one set by SetActiveInputNode. |
// Note that this action will not trigger an ActiveOutputNodeChanged event |
// and nothing will happen if the |node_id| has already been set as active. |
- virtual void AddActiveOutputNode(uint64 node_id) = 0; |
+ virtual void AddActiveOutputNode(uint64_t node_id) = 0; |
// Removes output node |node_id| from the active output list. This is used for |
// removing an active output node added by AddActiveOutputNode. |
- virtual void RemoveActiveOutputNode(uint64 node_id) = 0; |
+ virtual void RemoveActiveOutputNode(uint64_t node_id) = 0; |
// Swaps the left and right channel of the primary active output device. |
// Swap the left and right channel if |swap| is true; otherwise, swap the left |
// and right channel back to the normal mode. |
// The dbus message will be dropped if this feature is not supported on the |
// |node_id|. |
- virtual void SwapLeftRight(uint64 node_id, bool swap) = 0; |
+ virtual void SwapLeftRight(uint64_t node_id, bool swap) = 0; |
// Creates the instance. |
static CrasAudioClient* Create(); |