summaryrefslogtreecommitdiffstats
path: root/media/libmedia/JetPlayer.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-19 10:57:31 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-19 10:57:31 -0800
commit25658fd43d150a45fb37734a9f9f27f48bb5c133 (patch)
tree3b7102362b1c84181f8af6f2752bb6e7eb74881a /media/libmedia/JetPlayer.cpp
parent7a2146d5807030b2629f347736be5301b61e8811 (diff)
downloadframeworks_av-25658fd43d150a45fb37734a9f9f27f48bb5c133.zip
frameworks_av-25658fd43d150a45fb37734a9f9f27f48bb5c133.tar.gz
frameworks_av-25658fd43d150a45fb37734a9f9f27f48bb5c133.tar.bz2
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'media/libmedia/JetPlayer.cpp')
-rw-r--r--media/libmedia/JetPlayer.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp
index 9bd75c2..2c62104 100644
--- a/media/libmedia/JetPlayer.cpp
+++ b/media/libmedia/JetPlayer.cpp
@@ -86,8 +86,8 @@ int JetPlayer::init()
mState = EAS_STATE_ERROR;
return result;
}
- // init the JET library
- result = JET_Init(mEasData, NULL, 0);
+ // init the JET library with the default app event controller range
+ result = JET_Init(mEasData, NULL, sizeof(S_JET_CONFIG));
if( result != EAS_SUCCESS) {
LOGE("JetPlayer::init(): Error initializing JET library, aborting.");
mState = EAS_STATE_ERROR;
@@ -200,6 +200,11 @@ int JetPlayer::render() {
while (!mRender)
{
LOGV("JetPlayer::render(): signal wait");
+ if (audioStarted) {
+ mAudioTrack->pause();
+ // we have to restart the playback once we start rendering again
+ audioStarted = false;
+ }
mCondition.wait(mMutex);
LOGV("JetPlayer::render(): signal rx'd");
}
@@ -315,7 +320,7 @@ void JetPlayer::fireEventsFromJetQueue()
while (JET_GetEvent(mEasData, NULL, NULL)) { }
return;
}
-
+
EAS_U32 rawEvent;
while (JET_GetEvent(mEasData, &rawEvent, NULL)) {
mEventCallback(