summaryrefslogtreecommitdiffstats
path: root/modules/audio
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-01-17 17:34:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 17:34:53 -0800
commitd4cf73b3628f8802400f0de18e02913276960cca (patch)
treeca69d99bb42c8cf6a2a3cdbfeb86faa7f601ae4d /modules/audio
parent5b2053669183c7d2bb4d52b12fef068e5927c312 (diff)
parentca20b17b419eec2b196877be38f9c4290449aeac (diff)
downloadhardware_libhardware-d4cf73b3628f8802400f0de18e02913276960cca.zip
hardware_libhardware-d4cf73b3628f8802400f0de18e02913276960cca.tar.gz
hardware_libhardware-d4cf73b3628f8802400f0de18e02913276960cca.tar.bz2
Merge "audio policy: manage stream volume per device"
Diffstat (limited to 'modules/audio')
-rw-r--r--modules/audio/audio_policy.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c
index c805601..06ac976 100644
--- a/modules/audio/audio_policy.c
+++ b/modules/audio/audio_policy.c
@@ -163,6 +163,22 @@ static int ap_get_stream_volume_index(const struct audio_policy *pol,
return -ENOSYS;
}
+static int ap_set_stream_volume_index_for_device(struct audio_policy *pol,
+ audio_stream_type_t stream,
+ int index,
+ audio_devices_t device)
+{
+ return -ENOSYS;
+}
+
+static int ap_get_stream_volume_index_for_device(const struct audio_policy *pol,
+ audio_stream_type_t stream,
+ int *index,
+ audio_devices_t device)
+{
+ return -ENOSYS;
+}
+
static uint32_t ap_get_strategy_for_stream(const struct audio_policy *pol,
audio_stream_type_t stream)
{
@@ -250,6 +266,8 @@ static int create_default_ap(const struct audio_policy_device *device,
dap->policy.init_stream_volume = ap_init_stream_volume;
dap->policy.set_stream_volume_index = ap_set_stream_volume_index;
dap->policy.get_stream_volume_index = ap_get_stream_volume_index;
+ dap->policy.set_stream_volume_index_for_device = ap_set_stream_volume_index_for_device;
+ dap->policy.get_stream_volume_index_for_device = ap_get_stream_volume_index_for_device;
dap->policy.get_strategy_for_stream = ap_get_strategy_for_stream;
dap->policy.get_devices_for_stream = ap_get_devices_for_stream;
dap->policy.get_output_for_effect = ap_get_output_for_effect;