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

Unified Diff: chromeos/dbus/cras_audio_client.cc

Issue 1952983002: Listen for OutputNodeVolumeChanged signal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unimplemented method Created 4 years, 7 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
« no previous file with comments | « chromeos/dbus/cras_audio_client.h ('k') | chromeos/dbus/cras_audio_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/cras_audio_client.cc
diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc
index f2ce0291f99a2b2dfc590817b55ee0dda2ebf4a6..e9957ec47a1071af85d595115689b14fe123fde0 100644
--- a/chromeos/dbus/cras_audio_client.cc
+++ b/chromeos/dbus/cras_audio_client.cc
@@ -257,6 +257,15 @@ class CrasAudioClientImpl : public CrasAudioClient {
weak_ptr_factory_.GetWeakPtr()),
base::Bind(&CrasAudioClientImpl::SignalConnected,
weak_ptr_factory_.GetWeakPtr()));
+
+ // Monitor the D-Bus signal for output node volume change.
+ cras_proxy_->ConnectToSignal(
+ cras::kCrasControlInterface,
+ cras::kOutputNodeVolumeChanged,
+ base::Bind(&CrasAudioClientImpl::OutputNodeVolumeChangedReceived,
+ weak_ptr_factory_.GetWeakPtr()),
+ base::Bind(&CrasAudioClientImpl::SignalConnected,
+ weak_ptr_factory_.GetWeakPtr()));
}
private:
@@ -321,6 +330,21 @@ class CrasAudioClientImpl : public CrasAudioClient {
FOR_EACH_OBSERVER(Observer, observers_, ActiveInputNodeChanged(node_id));
}
+ void OutputNodeVolumeChangedReceived(dbus::Signal* signal) {
+ dbus::MessageReader reader(signal);
+ uint64_t node_id;
+ int volume;
+
+ if (!reader.PopUint64(&node_id)) {
+ LOG(ERROR) << "Error eading signal from cras:" << signal->ToString();
+ }
+ if (!reader.PopInt32(&volume)) {
+ LOG(ERROR) << "Error eading signal from cras:" << signal->ToString();
+ }
+ FOR_EACH_OBSERVER(Observer, observers_,
+ OutputNodeVolumeChanged(node_id, volume));
+ }
+
void OnGetVolumeState(const GetVolumeStateCallback& callback,
dbus::Response* response) {
bool success = true;
@@ -469,6 +493,10 @@ void CrasAudioClient::Observer::ActiveOutputNodeChanged(uint64_t node_id) {}
void CrasAudioClient::Observer::ActiveInputNodeChanged(uint64_t node_id) {}
+void CrasAudioClient::Observer::OutputNodeVolumeChanged(uint64_t node_id,
+ int volume) {
+}
+
CrasAudioClient::CrasAudioClient() {
}
« no previous file with comments | « chromeos/dbus/cras_audio_client.h ('k') | chromeos/dbus/cras_audio_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698