summaryrefslogtreecommitdiffstats
path: root/include/hardware_legacy/AudioHardwareInterface.h
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2012-03-21 17:42:25 -0700
committerMike Lockwood <lockwood@google.com>2012-03-21 17:42:25 -0700
commit0b934ade258294987f8bde9cd338d7b635522719 (patch)
treec4275d7c16157f0f195850f9cdecd14131224de6 /include/hardware_legacy/AudioHardwareInterface.h
parent7c85ce853421f6299eb5fd05782cf9e25a8f2071 (diff)
parent617c80a82e5620b2f16348e4bd3d7fc3b76e9021 (diff)
downloadhardware_libhardware_legacy-0b934ade258294987f8bde9cd338d7b635522719.zip
hardware_libhardware_legacy-0b934ade258294987f8bde9cd338d7b635522719.tar.gz
hardware_libhardware_legacy-0b934ade258294987f8bde9cd338d7b635522719.tar.bz2
Merge commit '617c80a'
Add a bridge implementation of get_master_volume. Conflicts: audio/audio_hw_hal.cpp Change-Id: Icff9d8dce05d1d811fca815cc39cb38a1df293f9
Diffstat (limited to 'include/hardware_legacy/AudioHardwareInterface.h')
-rw-r--r--include/hardware_legacy/AudioHardwareInterface.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/hardware_legacy/AudioHardwareInterface.h b/include/hardware_legacy/AudioHardwareInterface.h
index c781218..31d6b99 100644
--- a/include/hardware_legacy/AudioHardwareInterface.h
+++ b/include/hardware_legacy/AudioHardwareInterface.h
@@ -210,6 +210,14 @@ public:
virtual status_t setMasterVolume(float volume) = 0;
/**
+ * Get the current master volume value for the HAL, if the HAL supports
+ * master volume control. AudioFlinger will query this value from the
+ * primary audio HAL when the service starts and use the value for setting
+ * the initial master volume across all HALs.
+ */
+ virtual status_t getMasterVolume(float *volume) = 0;
+
+ /**
* setMode is called when the audio mode changes. NORMAL mode is for
* standard audio playback, RINGTONE when a ringtone is playing, and IN_CALL
* when a call is in progress.