aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-06-01 15:20:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-01 15:20:54 -0700
commited0061bce2998d42cf5d4f95b3a83c87b8bbfc2e (patch)
tree798241ed2c22d119bf154e68de3ecce324ca9592
parent2395271daac8e5ed58046a620d1da7cb9f1f9b7b (diff)
downloadquake-ed0061bce2998d42cf5d4f95b3a83c87b8bbfc2e.tar.gz
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2395271daac8e5ed58046a620d1da7cb9f1f9b7b
-rw-r--r--quake/src/WinQuake/snd_android.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/quake/src/WinQuake/snd_android.cpp b/quake/src/WinQuake/snd_android.cpp
index 516fa85..1327023 100644
--- a/quake/src/WinQuake/snd_android.cpp
+++ b/quake/src/WinQuake/snd_android.cpp
@@ -500,7 +500,7 @@ static float sinef(float x)
}
static
-void AndroidQuakeSoundCallback(AudioTrack::event_type event, void* user, void *info) {
+void AndroidQuakeSoundCallback(int event, void* user, void *info) {
if (event != AudioTrack::EVENT_MORE_DATA) return;
@@ -568,7 +568,7 @@ static bool shouldMixSilence() {
}
static
-void AndroidQuakeSoundCallback(AudioTrack::event_type event, void* user, void *info) {
+void AndroidQuakeSoundCallback(int event, void* user, void *info) {
if (event != AudioTrack::EVENT_MORE_DATA) return;