Switch Audio Preferences to per device.

chromeos/audio/cras_audio_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/audio/cras_audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
-#include "chromeos/audio/audio_pref_handler.h"
+#include "chromeos/audio/audio_devices_pref_handler.h"
 #include "chromeos/audio/mock_cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 using std::max;
 using std::min;
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 27 matching lines @@
 }
 
 void CrasAudioHandler::AudioObserver::OnActiveOutputNodeChanged() {
 }
 
 void CrasAudioHandler::AudioObserver::OnActiveInputNodeChanged() {
 }
 
 // static
 void CrasAudioHandler::Initialize(
-    scoped_refptr<AudioPrefHandler> audio_pref_handler) {
+    scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler) {
   CHECK(!g_cras_audio_handler);
   g_cras_audio_handler = new CrasAudioHandler(audio_pref_handler);
 }
 
 // static
 void CrasAudioHandler::InitializeForTesting() {
   CHECK(!g_cras_audio_handler);
   g_cras_audio_handler = new MockCrasAudioHandler();
 }
 
@@ skipping 48 matching lines @@
   for (size_t i = 0; i < audio_devices_.size(); ++i)
     device_list->push_back(audio_devices_[i]);
 }
 
 bool CrasAudioHandler::GetActiveOutputDevice(AudioDevice* device) const {
   for (size_t i = 0; i < audio_devices_.size(); ++i) {
     if (audio_devices_[i].id == active_output_node_id_) {
       *device = audio_devices_[i];
       return true;
     }
   }

[hshi1, 2013/05/02 02:59:56]

is the NOTREACHED() no longer needed?

[rkc, 2013/05/02 06:34:21]

Yes, the NOTREACHED is no longer relevant. Since we are doing the active device
switching in Chrome, not having an active device is a normal situation - for
example when the user plugs out the active device (in which case we should just
return false).

-  NOTREACHED() << "Can't find active output audio device";
   return false;
 }
 
 bool CrasAudioHandler::has_alternative_input() const {
   return has_alternative_input_;
 }
 
 bool CrasAudioHandler::has_alternative_output() const {
   return has_alternative_output_;
 }
 
 void CrasAudioHandler::SetOutputVolumePercent(int volume_percent) {
   volume_percent = min(max(volume_percent, 0), 100);
   if (volume_percent <= kMuteThresholdPercent)
     volume_percent = 0;
   SetOutputVolumeInternal(volume_percent);
   if (IsOutputMuted() && volume_percent > 0)
     SetOutputMute(false);
   if (!IsOutputMuted() && volume_percent == 0)
     SetOutputMute(true);
 }
 
 void CrasAudioHandler::AdjustOutputVolumeByPercent(int adjust_by_percent) {
   SetOutputVolumePercent(output_volume_ + adjust_by_percent);
 }
 
 void CrasAudioHandler::SetOutputMute(bool mute_on) {
   if (output_mute_locked_) {
-    NOTREACHED() << "Output mute has been locked";
+    LOG(WARNING) << "Tried to set volume with output mute locked";
     return;
   }
 
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       SetOutputMute(mute_on);
 
   if (!mute_on) {
     if (output_volume_ <= kMuteThresholdPercent) {
       // Avoid the situation when sound has been unmuted, but the volume
       // is set to a very low value, so user still can't hear any sound.
       SetOutputVolumeInternal(kDefaultUnmuteVolumePercent);
     }
   }
 }
 
 void CrasAudioHandler::SetInputMute(bool mute_on) {
   if (input_mute_locked_) {
-    NOTREACHED() << "Input mute has been locked";
+    LOG(WARNING) << "Tried to set gain with input mute locked";
     return;
   }
 
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       SetInputMute(mute_on);
 }
 
 void CrasAudioHandler::SetActiveOutputNode(uint64 node_id) {
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       SetActiveOutputNode(node_id);
 }
 
 void CrasAudioHandler::SetActiveInputNode(uint64 node_id) {
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       SetActiveInputNode(node_id);
 }
 
 CrasAudioHandler::CrasAudioHandler(
-    scoped_refptr<AudioPrefHandler> audio_pref_handler)
+    scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler)
     : audio_pref_handler_(audio_pref_handler),
       weak_ptr_factory_(this),
       output_mute_on_(false),
       input_mute_on_(false),
       output_volume_(0),
       active_output_node_id_(0),
       active_input_node_id_(0),
       has_alternative_input_(false),
       has_alternative_output_(false),
       output_mute_locked_(false),
       input_mute_locked_(false) {
   if (!audio_pref_handler)
     return;
   // If the DBusThreadManager or the CrasAudioClient aren't available, there
   // isn't much we can do. This should only happen when running tests.
   if (!chromeos::DBusThreadManager::IsInitialized() ||
       !chromeos::DBusThreadManager::Get() ||
       !chromeos::DBusThreadManager::Get()->GetCrasAudioClient())
     return;
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->AddObserver(this);
   audio_pref_handler_->AddAudioPrefObserver(this);
-  SetupInitialAudioState();
+  GetNodes();
 }
 
 CrasAudioHandler::~CrasAudioHandler() {
   if (!chromeos::DBusThreadManager::IsInitialized() ||
       !chromeos::DBusThreadManager::Get() ||
       !chromeos::DBusThreadManager::Get()->GetCrasAudioClient())
     return;
   chromeos::DBusThreadManager::Get()->GetCrasAudioClient()->
       RemoveObserver(this);
   if (audio_pref_handler_)
     audio_pref_handler_->RemoveAudioPrefObserver(this);
   audio_pref_handler_ = NULL;
 }
 
 void CrasAudioHandler::AudioClientRestarted() {
-  SetupInitialAudioState();
+  GetNodes();
 }
 
 void CrasAudioHandler::OutputVolumeChanged(int volume) {
   if (output_volume_ == volume)
     return;
 
   output_volume_ = volume;
   audio_pref_handler_->SetOutputVolumeValue(output_volume_);
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnOutputVolumeChanged());
 }
@@ skipping 18 matching lines @@
 void CrasAudioHandler::NodesChanged() {
   // Refresh audio nodes data.
   GetNodes();
 }
 
 void CrasAudioHandler::ActiveOutputNodeChanged(uint64 node_id) {
   if (active_output_node_id_ == node_id)
     return;
 
   active_output_node_id_ = node_id;
-  GetNodes();
+  SetupAudioState();
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnActiveOutputNodeChanged());
 }
 
 void CrasAudioHandler::ActiveInputNodeChanged(uint64 node_id) {
   if (active_input_node_id_ == node_id)
     return;
 
   active_input_node_id_ = node_id;
-  GetNodes();
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnActiveInputNodeChanged());
 }
 
 void CrasAudioHandler::OnAudioPolicyPrefChanged() {
   ApplyAudioPolicy();
 }
 
-void CrasAudioHandler::SetupInitialAudioState() {
+void CrasAudioHandler::SetupAudioState() {
   ApplyAudioPolicy();
 
   // Set the initial audio state to the ones read from audio prefs.
   output_mute_on_ = audio_pref_handler_->GetOutputMuteValue();
   output_volume_ = audio_pref_handler_->GetOutputVolumeValue();
   SetOutputVolumeInternal(output_volume_);
   SetOutputMute(output_mute_on_);
-
-  // Get the initial audio data.
-  GetNodes();
 }
 
 void CrasAudioHandler::ApplyAudioPolicy() {
   output_mute_locked_ = false;
   if (!audio_pref_handler_->GetAudioOutputAllowedValue()) {
     SetOutputMute(true);
     output_mute_locked_ = true;
   }
 
   input_mute_locked_ = false;
@@ skipping 40 matching lines @@
         device.is_input &&
         device.type != AUDIO_TYPE_INTERNAL_MIC) {
       has_alternative_input_ = true;
     } else if (!has_alternative_output_ &&
                !device.is_input &&
                device.type != AUDIO_TYPE_INTERNAL_SPEAKER) {
       has_alternative_output_ = true;
     }
   }
 
+  SetupAudioState();
   FOR_EACH_OBSERVER(AudioObserver, observers_, OnAudioNodesChanged());
 }
 
 }  // namespace chromeos