Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2eca1b53: Merge "Add return after NULL check in JetPlayer"

Browse Source 
* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
  Add return after NULL check in JetPlayer
This commit is contained in:
Elliott Hughes
2012-12-15 14:57:46 -08:00
committed by Android Git Automerger
parent 507ea24b8f 2eca1b53ae
commit 898d8048b6
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/jni/android_media_JetPlayer.cpp
View File

@@ -130,9 +130,10 @@ android_media_JetPlayer_loadFromFile(JNIEnv *env, jobject thiz, jstring path)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for openFile()");
return JNI_FALSE;
}
// set up event callback function
@@ -166,9 +167,10 @@ android_media_JetPlayer_loadFromFileD(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for openFile()");
return JNI_FALSE;
}
// set up event callback function
@@ -195,9 +197,10 @@ android_media_JetPlayer_closeFile(JNIEnv *env, jobject thiz)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for closeFile()");
return JNI_FALSE;
}
if (lpJet->closeFile()==EAS_SUCCESS) {
@@ -216,9 +219,10 @@ android_media_JetPlayer_play(JNIEnv *env, jobject thiz)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for play()");
return JNI_FALSE;
}
EAS_RESULT result = lpJet->play();
@@ -239,9 +243,10 @@ android_media_JetPlayer_pause(JNIEnv *env, jobject thiz)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for pause()");
return JNI_FALSE;
}
EAS_RESULT result = lpJet->pause();
@@ -268,9 +273,10 @@ android_media_JetPlayer_queueSegment(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for queueSegment()");
return JNI_FALSE;
}
EAS_RESULT result
@@ -294,9 +300,10 @@ android_media_JetPlayer_queueSegmentMuteArray(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for queueSegmentMuteArray()");
return JNI_FALSE;
}
EAS_RESULT result=EAS_FAILURE;
@@ -339,9 +346,10 @@ android_media_JetPlayer_setMuteFlags(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for setMuteFlags()");
return JNI_FALSE;
}
EAS_RESULT result;
@@ -363,9 +371,10 @@ android_media_JetPlayer_setMuteArray(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for setMuteArray()");
return JNI_FALSE;
}
EAS_RESULT result=EAS_FAILURE;
@@ -408,9 +417,10 @@ android_media_JetPlayer_setMuteFlag(JNIEnv *env, jobject thiz,
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for setMuteFlag()");
return JNI_FALSE;
}
EAS_RESULT result;
@@ -433,9 +443,10 @@ android_media_JetPlayer_triggerClip(JNIEnv *env, jobject thiz, jint clipId)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for triggerClip()");
return JNI_FALSE;
}
EAS_RESULT result;
@@ -457,9 +468,10 @@ android_media_JetPlayer_clearQueue(JNIEnv *env, jobject thiz)
{
JetPlayer *lpJet = (JetPlayer *)env->GetIntField(
thiz, javaJetPlayerFields.nativePlayerInJavaObj);
if (lpJet == NULL ) {
if (lpJet == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Unable to retrieve JetPlayer pointer for clearQueue()");
return JNI_FALSE;
}
EAS_RESULT result = lpJet->clearQueue();