diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:10:31 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-06 19:10:31 +0000 |
| commit | 6934b76075fabbd7a1f542b3000b250f4a589492 (patch) | |
| tree | ee799d0d21d283900490b988060d873ff82586af | |
| parent | d12c814d62775a6c4ccdb8e5195ef204d239ab4f (diff) | |
| download | bluez-6934b76075fabbd7a1f542b3000b250f4a589492.tar.gz | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I5d70c4def17fb904e39bbbca6b807dfa71b45bd9
| -rw-r--r-- | audio/android_audio_hw.c | 14 | ||||
| -rwxr-xr-x | audio/liba2dp.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c index f4902324..4a6048be 100644 --- a/audio/android_audio_hw.c +++ b/audio/android_audio_hw.c @@ -142,7 +142,7 @@ static int out_set_sample_rate(struct audio_stream *stream, uint32_t rate) { struct astream_out *out = (struct astream_out *)stream; - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); return 0; } @@ -167,7 +167,7 @@ static int out_get_format(const struct audio_stream *stream) static int out_set_format(struct audio_stream *stream, int format) { struct astream_out *out = (struct astream_out *)stream; - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); return 0; } @@ -205,7 +205,7 @@ static int _out_init_locked(struct astream_out *out, const char *addr) /* XXX: shouldn't this use the sample_rate/channel_count from 'out'? */ ret = a2dp_init(44100, 2, &out->data); if (ret < 0) { - LOGE("a2dp_init failed err: %d\n", ret); + ALOGE("a2dp_init failed err: %d\n", ret); out->data = NULL; return ret; } @@ -242,9 +242,9 @@ static int out_standby_stream_locked(struct astream_out *out) ret = pthread_cond_timeout_np(&out->write_cond, &out->lock, BUF_WRITE_COMPLETION_TIMEOUT_MS); - LOGE_IF(ret != 0, "out_standby_stream_locked() wait cond error %d", ret); + ALOGE_IF(ret != 0, "out_standby_stream_locked() wait cond error %d", ret); } - LOGE_IF(attempts == 0, "out_standby_stream_locked() a2dp_write() would not stop!!!"); + ALOGE_IF(attempts == 0, "out_standby_stream_locked() a2dp_write() would not stop!!!"); ALOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled); if (out->bt_enabled) { @@ -519,7 +519,7 @@ static void *_out_buf_thread_func(void *context) pthread_mutex_unlock(&out->lock); if (ret < 0) { - LOGE("%s: a2dp_write failed (%d)\n", __func__, ret); + ALOGE("%s: a2dp_write failed (%d)\n", __func__, ret); /* skip pending frames in case of write error */ _out_inc_rd_idx_locked(out, frames); break; @@ -715,7 +715,7 @@ static void adev_close_output_stream_locked(struct adev_a2dp *dev, /* invalid stream? */ if (!adev->output || adev->output != out) { - LOGE("%s: unknown stream %p (ours is %p)", __func__, out, adev->output); + ALOGE("%s: unknown stream %p (ours is %p)", __func__, out, adev->output); return; } diff --git a/audio/liba2dp.c b/audio/liba2dp.c index 40e090cd..aba24e4d 100755 --- a/audio/liba2dp.c +++ b/audio/liba2dp.c @@ -80,7 +80,7 @@ #define MAX_BITPOOL 64 #define MIN_BITPOOL 2 -#define ERR LOGE +#define ERR ALOGE /* Number of packets to buffer in the stream socket */ #define PACKET_BUFFER_COUNT 10 |