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

Unified Diff: chromeos/dbus/fake_cras_audio_client.cc

Issue 1274403003: Full Implementation of Audio for the Chrome Os Device Emulator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments Created 5 years, 4 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/fake_cras_audio_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/fake_cras_audio_client.cc
diff --git a/chromeos/dbus/fake_cras_audio_client.cc b/chromeos/dbus/fake_cras_audio_client.cc
index c59b3e5312fc9054eabdf922665c318161feb7b5..e28852bb201e2f23a41b083a04b7bcdcfbf9bb6e 100644
--- a/chromeos/dbus/fake_cras_audio_client.cc
+++ b/chromeos/dbus/fake_cras_audio_client.cc
@@ -98,25 +98,19 @@ void FakeCrasAudioClient::GetNodes(const GetNodesCallback& callback,
callback.Run(node_list_, true);
}
-void FakeCrasAudioClient::SetOutputNodeVolume(uint64 node_id,
- int32 volume) {
-}
+void FakeCrasAudioClient::SetOutputNodeVolume(uint64 node_id, int32 volume) {}
void FakeCrasAudioClient::SetOutputUserMute(bool mute_on) {
volume_state_.output_user_mute = mute_on;
- FOR_EACH_OBSERVER(Observer,
- observers_,
+ FOR_EACH_OBSERVER(Observer, observers_,
OutputMuteChanged(volume_state_.output_user_mute));
}
-void FakeCrasAudioClient::SetInputNodeGain(uint64 node_id,
- int32 input_gain) {
-}
+void FakeCrasAudioClient::SetInputNodeGain(uint64 node_id, int32 input_gain) {}
void FakeCrasAudioClient::SetInputMute(bool mute_on) {
volume_state_.input_mute = mute_on;
- FOR_EACH_OBSERVER(Observer,
- observers_,
+ FOR_EACH_OBSERVER(Observer, observers_,
InputMuteChanged(volume_state_.input_mute));
}
@@ -131,9 +125,7 @@ void FakeCrasAudioClient::SetActiveOutputNode(uint64 node_id) {
node_list_[i].active = true;
}
active_output_node_id_ = node_id;
- FOR_EACH_OBSERVER(Observer,
- observers_,
- ActiveOutputNodeChanged(node_id));
+ FOR_EACH_OBSERVER(Observer, observers_, ActiveOutputNodeChanged(node_id));
}
void FakeCrasAudioClient::SetActiveInputNode(uint64 node_id) {
@@ -147,9 +139,7 @@ void FakeCrasAudioClient::SetActiveInputNode(uint64 node_id) {
node_list_[i].active = true;
}
active_input_node_id_ = node_id;
- FOR_EACH_OBSERVER(Observer,
- observers_,
- ActiveInputNodeChanged(node_id));
+ FOR_EACH_OBSERVER(Observer, observers_, ActiveInputNodeChanged(node_id));
}
void FakeCrasAudioClient::AddActiveInputNode(uint64 node_id) {
@@ -183,6 +173,23 @@ void FakeCrasAudioClient::RemoveActiveOutputNode(uint64 node_id) {
}
}
+void FakeCrasAudioClient::InsertAudioNodeToList(const AudioNode& audio_node) {
+ auto iter = FindNode(audio_node.id);
+ if (iter != node_list_.end())
+ (*iter) = audio_node;
+ else
+ node_list_.push_back(audio_node);
+ FOR_EACH_OBSERVER(Observer, observers_, NodesChanged());
+}
+
+void FakeCrasAudioClient::RemoveAudioNodeFromList(const uint64& node_id) {
+ auto iter = FindNode(node_id);
+ if (iter != node_list_.end()) {
+ node_list_.erase(iter);
+ FOR_EACH_OBSERVER(Observer, observers_, NodesChanged());
+ }
+}
+
void FakeCrasAudioClient::SetAudioNodesForTesting(
const AudioNodeList& audio_nodes) {
node_list_ = audio_nodes;
@@ -194,4 +201,10 @@ void FakeCrasAudioClient::SetAudioNodesAndNotifyObserversForTesting(
FOR_EACH_OBSERVER(Observer, observers_, NodesChanged());
}
+AudioNodeList::iterator FakeCrasAudioClient::FindNode(uint64 node_id) {
+ return std::find_if(
+ node_list_.begin(), node_list_.end(),
+ [node_id](const AudioNode& node) { return node_id == node.id; });
+}
+
} // namespace chromeos
« no previous file with comments | « chromeos/dbus/fake_cras_audio_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698