diff options
| author | Mike J. Chen <mjchen@google.com> | 2011-08-15 12:05:00 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2012-02-10 08:58:32 -0800 |
| commit | 5ad38a901dcca2961f3ed35ae0b206c13bc515cd (patch) | |
| tree | 5175ce575888ff146a63d1e2ab44eb103a33687e /modules/local_time | |
| parent | ad255ee424e36f1fbf5e92e320328ceae1aecd49 (diff) | |
| download | hardware_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/local_time')
| -rw-r--r-- | modules/local_time/local_time_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |