| commit | a4eb0d86a29be2763be5fac51727858d5095794b | [log] [tgz] |
|---|---|---|
| author | Phil Burk <philburk@google.com> | Wed Apr 12 15:44:06 2017 -0700 |
| committer | Phil Burk <philburk@google.com> | Thu Apr 13 13:50:40 2017 +0000 |
| tree | f725cf700cac0e52e0376b6a9a867f4c37fe3bdc | |
| parent | 9e7dd63dfff0cc967f025ea9e27a299aaa99fd69 [diff] |
aaudio: merge contents of AAudioDefinitions.h into AAudio.h As requested by native API council. Bug: 30210002 Bug: 33398120 Test: CTS test_aaudio Change-Id: I5ea7c53d09469221263d84cf6f82082e67c2523b Signed-off-by: Phil Burk <philburk@google.com>
diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp index 26fa75d..5637f0d 100644 --- a/media/libaaudio/src/utility/AAudioUtilities.cpp +++ b/media/libaaudio/src/utility/AAudioUtilities.cpp
@@ -22,7 +22,7 @@ #include <sys/types.h> #include <utils/Errors.h> -#include "aaudio/AAudioDefinitions.h" +#include "aaudio/AAudio.h" #include "AAudioUtilities.h" using namespace android;
diff --git a/media/libaaudio/src/utility/AAudioUtilities.h b/media/libaaudio/src/utility/AAudioUtilities.h index d3b5ffe..3dc501e 100644 --- a/media/libaaudio/src/utility/AAudioUtilities.h +++ b/media/libaaudio/src/utility/AAudioUtilities.h
@@ -23,7 +23,7 @@ #include <utils/Errors.h> #include <hardware/audio.h> -#include "aaudio/AAudioDefinitions.h" +#include "aaudio/AAudio.h" /** * Convert an AAudio result into the closest matching Android status.
diff --git a/media/libaaudio/src/utility/AudioClock.h b/media/libaaudio/src/utility/AudioClock.h index 952c7b8..43b71b0 100644 --- a/media/libaaudio/src/utility/AudioClock.h +++ b/media/libaaudio/src/utility/AudioClock.h
@@ -20,7 +20,7 @@ #include <stdint.h> #include <time.h> -#include <aaudio/AAudioDefinitions.h> +#include <aaudio/AAudio.h> // Time conversion constants. #define AAUDIO_NANOS_PER_MICROSECOND ((int64_t)1000)
diff --git a/media/libaaudio/src/utility/HandleTracker.cpp b/media/libaaudio/src/utility/HandleTracker.cpp index c4880b8..f957234 100644 --- a/media/libaaudio/src/utility/HandleTracker.cpp +++ b/media/libaaudio/src/utility/HandleTracker.cpp
@@ -24,7 +24,7 @@ #include <stdint.h> #include <utils/Mutex.h> -#include <aaudio/AAudioDefinitions.h> +#include <aaudio/AAudio.h> #include "HandleTracker.h" using android::Mutex;