summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 00:44:58 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 00:44:58 +0000
commit029a00c5f6a820cf3f3d6baa607a012c48d0917a (patch)
treef7c4c078890ffc4316a7f17dc8a9e08b9d9d644b /ash
parentf77f3d5bf2d6f098b8c692848c91c74587285d37 (diff)
downloadchromium_src-029a00c5f6a820cf3f3d6baa607a012c48d0917a.zip
chromium_src-029a00c5f6a820cf3f3d6baa607a012c48d0917a.tar.gz
chromium_src-029a00c5f6a820cf3f3d6baa607a012c48d0917a.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. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=198556 Review URL: https://codereview.chromium.org/14652027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198581 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;