summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-01-07 08:50:33 -0800
committerGlenn Kasten <gkasten@google.com>2015-01-07 11:49:07 -0800
commit14463a8e53e2a5185a395e2045fd33ad4a63050d (patch)
tree481ef76d843ea40d0176a8555231934c94517a18
parent5bb641dc3b855679e0932cb5c366b1b39fbb72f4 (diff)
downloadandroid_frameworks_wilhelm-14463a8e53e2a5185a395e2045fd33ad4a63050d.tar.gz
android_frameworks_wilhelm-14463a8e53e2a5185a395e2045fd33ad4a63050d.tar.bz2
android_frameworks_wilhelm-14463a8e53e2a5185a395e2045fd33ad4a63050d.zip
Fix unsigned warnings
Change-Id: I8d174235cb8092d4e879ec43228e7f7f6fdad462
-rw-r--r--tests/listening/slesTest_playMuteSolo.cpp2
-rw-r--r--tests/mimeUri/slesTestLoopUri.cpp2
-rw-r--r--tests/mimeUri/slesTestSlowDownUri.cpp2
-rw-r--r--tests/sandbox/reverb.c4
-rw-r--r--tests/sandbox/xaplay.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/listening/slesTest_playMuteSolo.cpp b/tests/listening/slesTest_playMuteSolo.cpp
index e0abe16..77a34d6 100644
--- a/tests/listening/slesTest_playMuteSolo.cpp
+++ b/tests/listening/slesTest_playMuteSolo.cpp
@@ -51,7 +51,7 @@ void ExitOnErrorFunc( SLresult result , int line)
// These are extensions to OpenSL ES 1.0.1 values
#define SL_PREFETCHSTATUS_UNKNOWN 0
-#define SL_PREFETCHSTATUS_ERROR (-1)
+#define SL_PREFETCHSTATUS_ERROR ((SLuint32) -1)
// Mutex and condition shared with main program to protect prefetch_status
diff --git a/tests/mimeUri/slesTestLoopUri.cpp b/tests/mimeUri/slesTestLoopUri.cpp
index a7a4e0d..f0766c7 100644
--- a/tests/mimeUri/slesTestLoopUri.cpp
+++ b/tests/mimeUri/slesTestLoopUri.cpp
@@ -32,7 +32,7 @@
// These are extensions to OpenSL ES 1.0.1 values
#define SL_PREFETCHSTATUS_UNKNOWN 0
-#define SL_PREFETCHSTATUS_ERROR (-1)
+#define SL_PREFETCHSTATUS_ERROR ((SLuint32) -1)
// Mutex and condition shared with main program to protect prefetch_status
diff --git a/tests/mimeUri/slesTestSlowDownUri.cpp b/tests/mimeUri/slesTestSlowDownUri.cpp
index c04c6ef..ec95a45 100644
--- a/tests/mimeUri/slesTestSlowDownUri.cpp
+++ b/tests/mimeUri/slesTestSlowDownUri.cpp
@@ -34,7 +34,7 @@
// These are extensions to OpenSL ES 1.0.1 values
#define SL_PREFETCHSTATUS_UNKNOWN 0
-#define SL_PREFETCHSTATUS_ERROR (-1)
+#define SL_PREFETCHSTATUS_ERROR ((SLuint32) -1)
// Mutex and condition shared with main program to protect prefetch_status
diff --git a/tests/sandbox/reverb.c b/tests/sandbox/reverb.c
index 86ea668..eedf2bd 100644
--- a/tests/sandbox/reverb.c
+++ b/tests/sandbox/reverb.c
@@ -170,8 +170,8 @@ void printEnvNames(void)
// These are extensions to OpenSL ES 1.0.1 values
-#define SL_PREFETCHSTATUS_UNKNOWN 0
-#define SL_PREFETCHSTATUS_ERROR (-1)
+#define SL_PREFETCHSTATUS_UNKNOWN ((SLuint32) 0)
+#define SL_PREFETCHSTATUS_ERROR ((SLuint32) -1)
// Mutex and condition shared with main program to protect prefetch_status
diff --git a/tests/sandbox/xaplay.c b/tests/sandbox/xaplay.c
index 3866144..455fdd6 100644
--- a/tests/sandbox/xaplay.c
+++ b/tests/sandbox/xaplay.c
@@ -806,7 +806,7 @@ streamIndex, &mediaContainerInformation);
if (pauseMs >= 0) {
result = (*playerPlay)->GetPosition(playerPlay, &position);
assert(XA_RESULT_SUCCESS == result);
- if (position >= pauseMs) {
+ if ((int) position >= pauseMs) {
printf("Pausing for 5 seconds at position %u\n", position);
result = (*playerPlay)->SetPlayState(playerPlay, XA_PLAYSTATE_PAUSED);
assert(XA_RESULT_SUCCESS == result);