commit 7a09a4841979387ca11dab38f8340c766e62f167
author Steve Block <steveblock@google.com> Wed Oct 26 04:48:34 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 26 04:48:34 2011 -0700
tree c017f526c83201efaaf0ff62d4c5122752285402
parent cfeb2e819959b28ce98f5a2358bf753a05839228
parent 999d00b91f78f2fe1aa0648aab49bc857bdec8f6

am 999d00b9: (-s ours) Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

* commit '999d00b91f78f2fe1aa0648aab49bc857bdec8f6':
  Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

audio/android_audio_hw.c

diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c
index 6ae794e..30e1a22 100644
--- a/audio/android_audio_hw.c
+++ b/audio/android_audio_hw.c
@@ -200,7 +200,7 @@
     if (out->standby || !out->data)
         return 0;
 
-    ALOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled);
+    LOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled);
     if (out->bt_enabled)
         ret = a2dp_stop(out->data);
     release_wake_lock(A2DP_WAKE_LOCK_NAME);
@@ -214,7 +214,7 @@
     out_standby_stream_locked(out);
 
     if (out->data) {
-        ALOGV("%s: calling a2dp_cleanup()", __func__);
+        LOGV("%s: calling a2dp_cleanup()", __func__);
         a2dp_cleanup(out->data);
         out->data = NULL;
     }
@@ -322,7 +322,7 @@
 
     pthread_mutex_lock(&out->lock);
     if (!out->bt_enabled || out->suspended) {
-        ALOGV("a2dp %s: bluetooth disabled bt_en %d, suspended %d",
+        LOGV("a2dp %s: bluetooth disabled bt_en %d, suspended %d",
              out->bt_enabled, out->suspended);
         ret = -1;
         goto err_bt_disabled;
@@ -360,7 +360,7 @@
     now = system_time();
     elapsed_us = (now - out->last_write_time) / 1000UL;
     if (elapsed_us < (out->buffer_duration_us / 4)) {
-        ALOGV("A2DP sink runs too fast");
+        LOGV("A2DP sink runs too fast");
         usleep(out->buffer_duration_us - elapsed_us);
     }
     out->last_write_time = now;
@@ -426,7 +426,7 @@
 
     /* one output stream at a time */
     if (adev->output) {
-        ALOGV("output exists");
+        LOGV("output exists");
         ret = -EBUSY;
         goto err_output_exists;
     }
@@ -477,7 +477,7 @@
     if (!_out_validate_parms(out, format ? *format : 0,
                              channels ? *channels : 0,
                              sample_rate ? *sample_rate : 0)) {
-        ALOGV("invalid parameters");
+        LOGV("invalid parameters");
         ret = -EINVAL;
         goto err_validate_parms;
     }

audio/liba2dp.c

diff --git a/audio/liba2dp.c b/audio/liba2dp.c
index 9df019f..62f52d4 100755
--- a/audio/liba2dp.c
+++ b/audio/liba2dp.c
@@ -64,7 +64,7 @@
 #endif
 
 #ifdef ENABLE_VERBOSE
-#define VDBG ALOGV
+#define VDBG LOGV
 #else
 #define VDBG(fmt, arg...)
 #endif