diff options
Diffstat (limited to 'chromeos/dbus/cras_audio_client.cc')
| -rw-r--r-- | chromeos/dbus/cras_audio_client.cc | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc index 189a272..e70ba2a 100644 --- a/chromeos/dbus/cras_audio_client.cc +++ b/chromeos/dbus/cras_audio_client.cc @@ -24,23 +24,22 @@ class CrasAudioClientImpl : public CrasAudioClient { public: CrasAudioClientImpl() : cras_proxy_(NULL), weak_ptr_factory_(this) {} - virtual ~CrasAudioClientImpl() { - } + ~CrasAudioClientImpl() override {} // CrasAudioClient overrides: - virtual void AddObserver(Observer* observer) override { + void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) override { + void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(const Observer* observer) const override { + bool HasObserver(const Observer* observer) const override { return observers_.HasObserver(observer); } - virtual void GetVolumeState(const GetVolumeStateCallback& callback) override { + void GetVolumeState(const GetVolumeStateCallback& callback) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kGetVolumeState); cras_proxy_->CallMethod( @@ -50,8 +49,8 @@ class CrasAudioClientImpl : public CrasAudioClient { weak_ptr_factory_.GetWeakPtr(), callback)); } - virtual void GetNodes(const GetNodesCallback& callback, - const ErrorCallback& error_callback) override { + void GetNodes(const GetNodesCallback& callback, + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kGetNodes); cras_proxy_->CallMethodWithErrorCallback( @@ -63,7 +62,7 @@ class CrasAudioClientImpl : public CrasAudioClient { weak_ptr_factory_.GetWeakPtr(), error_callback)); } - virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) override { + void SetOutputNodeVolume(uint64 node_id, int32 volume) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetOutputNodeVolume); dbus::MessageWriter writer(&method_call); @@ -75,7 +74,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetOutputUserMute(bool mute_on) override { + void SetOutputUserMute(bool mute_on) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetOutputUserMute); dbus::MessageWriter writer(&method_call); @@ -86,7 +85,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetInputNodeGain(uint64 node_id, int32 input_gain) override { + void SetInputNodeGain(uint64 node_id, int32 input_gain) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetInputNodeGain); dbus::MessageWriter writer(&method_call); @@ -98,7 +97,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetInputMute(bool mute_on) override { + void SetInputMute(bool mute_on) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetInputMute); dbus::MessageWriter writer(&method_call); @@ -109,7 +108,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetActiveOutputNode(uint64 node_id) override { + void SetActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -120,7 +119,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetActiveInputNode(uint64 node_id) override { + void SetActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -131,7 +130,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void AddActiveInputNode(uint64 node_id) override { + void AddActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -142,7 +141,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void RemoveActiveInputNode(uint64 node_id) override { + void RemoveActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -153,7 +152,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void AddActiveOutputNode(uint64 node_id) override { + void AddActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -163,7 +162,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void RemoveActiveOutputNode(uint64 node_id) override { + void RemoveActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -173,7 +172,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SwapLeftRight(uint64 node_id, bool swap) override { + void SwapLeftRight(uint64 node_id, bool swap) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSwapLeftRight); dbus::MessageWriter writer(&method_call); @@ -185,7 +184,7 @@ class CrasAudioClientImpl : public CrasAudioClient { } protected: - virtual void Init(dbus::Bus* bus) override { + void Init(dbus::Bus* bus) override { cras_proxy_ = bus->GetObjectProxy(cras::kCrasServiceName, dbus::ObjectPath(cras::kCrasServicePath)); |