summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2011-08-15 12:05:00 -0700
committerMike Lockwood <lockwood@google.com>2012-02-10 08:58:32 -0800
commit5ad38a901dcca2961f3ed35ae0b206c13bc515cd (patch)
tree5175ce575888ff146a63d1e2ab44eb103a33687e /modules
parentad255ee424e36f1fbf5e92e320328ceae1aecd49 (diff)
downloadhardware_libhardware-5ad38a901dcca2961f3ed35ae0b206c13bc515cd.zip
hardware_libhardware-5ad38a901dcca2961f3ed35ae0b206c13bc515cd.tar.gz
hardware_libhardware-5ad38a901dcca2961f3ed35ae0b206c13bc515cd.tar.bz2
Modifications to audio_hal for Android@Home.
This is a squashed merge of the following changes: Commit f560da61a5e128ca9f82f7fe939afcf1f09188c7 Author: John Grossman <johngro@google.com> Date: Thu Aug 11 15:34:55 2011 -0700 Fill out a missing entry in the audio HAL function table. The entry for get_initial_master_volume was missing from the non-legacy audio HAL and needs to be filled out. Also fix up the order of the comments describing the get_initial_master_volume method. Change-Id: I87d5415ef92611497a6dab4c657fc00367c4d80b commit cea82facb63fd237a4ea6fb770605fcb500850ff Author: Jason Simmons <jsimmons@google.com> Date: Thu Jun 16 14:24:24 2011 -0700 Define a replacement for getSampleDelta that returns a DMA start time and count of samples queued Change-Id: I2d13f57b5a8c5b97fb3aa0a90834ce91c56864ef commit 60a9acd7eee470a8d870218e8be618bfa3be15a5 Author: Mike J. Chen <mjchen@google.com> Date: Tue Jun 7 09:13:23 2011 -0700 Add Android@Home extensions to new Audio HAL interface. Change-Id: I3ea4676d4b7d2afd78a5a7a7003ad5c437276d05 Signed-off-by: Mike J. Chen <mjchen@google.com> Change-Id: I09f3756d12a1ce4f9af39610ed857890742a72df Signed-off-by: Mike J. Chen <mjchen@google.com> Signed-off-by: John Grossman <johngro@google.com> Conflicts: include/hardware/audio.h modules/audio/audio_hw.c
Diffstat (limited to 'modules')
-rw-r--r--modules/audio/audio_hw.c14
-rw-r--r--modules/local_time/local_time_hw.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c
index a2d7861..4069ace 100644
--- a/modules/audio/audio_hw.c
+++ b/modules/audio/audio_hw.c
@@ -126,6 +126,12 @@ static int out_remove_audio_effect(const struct audio_stream *stream, effect_han
return 0;
}
+static int out_get_next_write_timestamp(const struct audio_stream_out *stream,
+ int64_t *timestamp)
+{
+ return -EINVAL;
+}
+
/** audio_stream_in implementation **/
static uint32_t in_get_sample_rate(const struct audio_stream *stream)
{
@@ -236,6 +242,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
out->stream.set_volume = out_set_volume;
out->stream.write = out_write;
out->stream.get_render_position = out_get_render_position;
+ out->stream.get_next_write_timestamp = out_get_next_write_timestamp;
*stream_out = &out->stream;
return 0;
@@ -278,6 +285,12 @@ static int adev_set_master_volume(struct audio_hw_device *dev, float volume)
return -ENOSYS;
}
+static int adev_get_master_volume(struct audio_hw_device *dev,
+ float *volume)
+{
+ return -ENOSYS;
+}
+
static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode)
{
return 0;
@@ -401,6 +414,7 @@ static int adev_open(const hw_module_t* module, const char* name,
adev->device.init_check = adev_init_check;
adev->device.set_voice_volume = adev_set_voice_volume;
adev->device.set_master_volume = adev_set_master_volume;
+ adev->device.get_master_volume = adev_get_master_volume;
adev->device.set_mode = adev_set_mode;
adev->device.set_mic_mute = adev_set_mic_mute;
adev->device.get_mic_mute = adev_get_mic_mute;
diff --git a/modules/local_time/local_time_hw.c b/modules/local_time/local_time_hw.c
index a1f5d43..308f7d9 100644
--- a/modules/local_time/local_time_hw.c
+++ b/modules/local_time/local_time_hw.c
@@ -39,7 +39,7 @@ static int64_t ltdev_get_local_time(struct local_time_hw_device* dev)
ret = clock_gettime(CLOCK_MONOTONIC, &ts);
if (ret < 0) {
- LOGW("%s failed to fetch CLOCK_MONOTONIC value! (res = %d)",
+ ALOGW("%s failed to fetch CLOCK_MONOTONIC value! (res = %d)",
dev->common.module->name, ret);
return 0;
}