Save/Restore ALSA volume/mute fix

chrome/browser/chromeos/audio_mixer_alsa.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/audio_mixer_alsa.h"
 
 #include <alsa/asoundlib.h>
 
 #include "base/logging.h"
 #include "base/task.h"
@@ skipping 282 matching lines @@
   if (pref_mute == kPrefMuteInvalid)
     mute = GetElementMuted_Locked(elem_master_);
   else
     mute = (pref_mute == kPrefMuteOn) ? true : false;
 
   VLOG(1) << "Setting volume to " << pref_volume << " and mute to " << mute;
 
   if (mute) {
     save_volume_ = pref_volume;
     DoSetVolumeDb_Locked(min_volume_);
-  } else if (pref_mute == kPrefMuteOff) {
+  } else {
       DoSetVolumeDb_Locked(pref_volume);

[davejcool, 2011/01/21 19:29:15]

This check should have been removed once I added the block above to get the
current volume/mute value if we've never saved anything to prefs yet.

[scherkus (not reviewing), 2011/01/21 21:26:04]

nit: indentation is off here

[davejcool, 2011/01/21 22:39:29]

D'oh!  This'll be formatted right in the next CL...

   }
 
   SetElementMuted_Locked(elem_master_, mute);
   if (elem_pcm_)
     SetElementMuted_Locked(elem_pcm_, mute);
 }
 
 void AudioMixerAlsa::RestoreVolumeMuteOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // This happens during init, so set the volume off the UI thread.
@@ skipping 117 matching lines @@
 void AudioMixerAlsa::SetElementMuted_Locked(snd_mixer_elem_t* elem, bool mute) {
   int enabled = mute ? 0 : 1;
   snd_mixer_selem_set_playback_switch_all(elem, enabled);
 
   VLOG(1) << "Set playback switch " << snd_mixer_selem_get_name(elem)
           << " to " << enabled;
 }
 
 }  // namespace chromeos