summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 22:49:53 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 22:49:53 +0000
commitdbfbd1e3b13855c2b82c5c47645faf6ecd1fb041 (patch)
treefa3eb06c9969703a982dddbc26dd7d437334846c /ash
parenta15ff65351d57c9a53d288374f0e8ac7bcdbbd19 (diff)
downloadchromium_src-dbfbd1e3b13855c2b82c5c47645faf6ecd1fb041.zip
chromium_src-dbfbd1e3b13855c2b82c5c47645faf6ecd1fb041.tar.gz
chromium_src-dbfbd1e3b13855c2b82c5c47645faf6ecd1fb041.tar.bz2
Implement the rest of the audio API.
Picking up where https://codereview.chromium.org/13486004/ left off, implemented the setProperties and setActiveDevices calls; also fixed GetNodes to also return the volume of the devices. R=hshi@chromium.org, jennyz@chromium.org, mpcomplete@chromium.org BUG=175798 TEST=Wrote a test extension to set the volume on the active and inactive devices, to verify they were set correctly. Also wrote code to switch active devices to verify that the devices did switch. Review URL: https://codereview.chromium.org/14652027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/audio/tray_audio.cc6
-rw-r--r--ash/system/chromeos/audio/tray_audio.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/ash/system/chromeos/audio/tray_audio.cc b/ash/system/chromeos/audio/tray_audio.cc
index 246b082..02daa87 100644
--- a/ash/system/chromeos/audio/tray_audio.cc
+++ b/ash/system/chromeos/audio/tray_audio.cc
@@ -596,6 +596,12 @@ void TrayAudio::OnOutputMuteChanged() {
}
}
+void TrayAudio::OnInputGainChanged() {
+}
+
+void TrayAudio::OnInputMuteChanged() {
+}
+
void TrayAudio::OnAudioNodesChanged() {
Update();
}
diff --git a/ash/system/chromeos/audio/tray_audio.h b/ash/system/chromeos/audio/tray_audio.h
index af8f7a9..da08219 100644
--- a/ash/system/chromeos/audio/tray_audio.h
+++ b/ash/system/chromeos/audio/tray_audio.h
@@ -43,6 +43,8 @@ class TrayAudio : public TrayImageItem,
// Overridden from chromeos::CrasAudioHandler::AudioObserver.
virtual void OnOutputVolumeChanged() OVERRIDE;
virtual void OnOutputMuteChanged() OVERRIDE;
+ virtual void OnInputGainChanged() OVERRIDE;
+ virtual void OnInputMuteChanged() OVERRIDE;
virtual void OnAudioNodesChanged() OVERRIDE;
virtual void OnActiveOutputNodeChanged() OVERRIDE;
virtual void OnActiveInputNodeChanged() OVERRIDE;