summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-03-26 11:23:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-26 11:23:49 -0700
commit383c4b3e63b02dfb348db7504af0efefa7b6a682 (patch)
treea175275540540538a95ebf26fbc24d75d88317a0 /include
parent56ca534e65427bdefb7674060f5faa94539b6995 (diff)
parentf5e18125498b768d4528e4d1c19533c2b16f338b (diff)
downloadframeworks_base-383c4b3e63b02dfb348db7504af0efefa7b6a682.zip
frameworks_base-383c4b3e63b02dfb348db7504af0efefa7b6a682.tar.gz
frameworks_base-383c4b3e63b02dfb348db7504af0efefa7b6a682.tar.bz2
Merge "reorganize SoundPool and JetPlayer code."
Diffstat (limited to 'include')
-rw-r--r--include/media/JetPlayer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h
index 38a3e44..0616bf0 100644
--- a/include/media/JetPlayer.h
+++ b/include/media/JetPlayer.h
@@ -18,7 +18,6 @@
#define JETPLAYER_H_
#include <utils/threads.h>
-#include <nativehelper/jni.h>
#include <libsonivox/jet.h>
#include <libsonivox/eas_types.h>
@@ -40,7 +39,7 @@ public:
static const int JET_NUMQUEUEDSEGMENT_UPDATE = 3;
static const int JET_PAUSE_UPDATE = 4;
- JetPlayer(jobject javaJetPlayer,
+ JetPlayer(void *javaJetPlayer,
int maxTracks = 32,
int trackBufferSize = 1200);
~JetPlayer();
@@ -75,7 +74,7 @@ private:
jetevent_callback mEventCallback;
- jobject mJavaJetPlayerRef;
+ void* mJavaJetPlayerRef;
Mutex mMutex; // mutex to sync the render and playback thread with the JET calls
pid_t mTid;
Condition mCondition;