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

Unified Diff: chromeos/audio/cras_audio_handler.cc

Issue 2127033004: Do not notify Volume change event to CrasAudioHandler::Observer when CrasAudioHandler change volume… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/audio/cras_audio_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/audio/cras_audio_handler.cc
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
index fef5c90b7498b23197a659f3a4703399a5d2b535..64e4271b3d1bb3c714861f07f9ffaf90c4fa383f 100644
--- a/chromeos/audio/cras_audio_handler.cc
+++ b/chromeos/audio/cras_audio_handler.cc
@@ -611,6 +611,18 @@ void CrasAudioHandler::OutputNodeVolumeChanged(uint64_t node_id, int volume) {
// volume.
output_volume_ = volume;
audio_pref_handler_->SetVolumeGainValue(*device, volume);
+
+ if (initializing_audio_state_) {
+ // Reset the flag after the first OutputNodeVolumeChanged, just in case
+ // cras didn't respond to the initial SetOutputNodeVolume request.
+ initializing_audio_state_ = false;
+ // Do not notify the observers for volume changed event if CrasAudioHandler
+ // is initializing its state, i.e., the volume change event is not from
+ // user action, no need to notify UI to pop uo the volume slider bar.
+ if (init_node_id_ == node_id && init_volume_ == volume)
+ return;
+ }
+
FOR_EACH_OBSERVER(AudioObserver, observers_,
OnOutputNodeVolumeChanged(node_id, volume));
}
@@ -716,6 +728,11 @@ void CrasAudioHandler::SetupAudioOutputState() {
output_volume_ = audio_pref_handler_->GetOutputVolumeValue(device);
SetOutputMuteInternal(output_mute_on_);
+
+ if (initializing_audio_state_) {
+ init_node_id_ = active_output_node_id_;
+ init_volume_ = output_volume_;
+ }
SetOutputNodeVolume(active_output_node_id_, output_volume_);
}
@@ -743,6 +760,7 @@ void CrasAudioHandler::SetupAdditionalActiveAudioNodeState(uint64_t node_id) {
}
void CrasAudioHandler::InitializeAudioState() {
+ initializing_audio_state_ = true;
ApplyAudioPolicy();
// Defer querying cras for GetNodes until cras service becomes available.
« no previous file with comments | « chromeos/audio/cras_audio_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698