diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-12 11:43:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-12 11:43:55 -0700 |
| commit | 5f80742306d6d66b1641f96b57ad819c3667b18e (patch) | |
| tree | 1099d5cc505cdf8f9d75b405213feb0042a34d4e /media/jni | |
| parent | 451a37ed2d4dca5aed13c4b10bf25590cd41a462 (diff) | |
| parent | d670b8c61ebd13324ac21bdbc08d8a02fc0a765a (diff) | |
| download | frameworks_base-5f80742306d6d66b1641f96b57ad819c3667b18e.zip frameworks_base-5f80742306d6d66b1641f96b57ad819c3667b18e.tar.gz frameworks_base-5f80742306d6d66b1641f96b57ad819c3667b18e.tar.bz2 | |
am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'
* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 5abe451..6317fe2 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -125,8 +125,8 @@ static sp<MediaPlayer> setMediaPlayer(JNIEnv* env, jobject thiz, const sp<MediaP return old; } -// If exception is NULL and opStatus is not OK, this method sends an error -// event to the client application; otherwise, if exception is not NULL and +// If exception is NULL and opStatus is not OK, this method sends an error +// event to the client application; otherwise, if exception is not NULL and // opStatus is not OK, this method throws the given exception to the client // application. static void process_media_player_call(JNIEnv *env, jobject thiz, status_t opStatus, const char* exception, const char *message) @@ -203,7 +203,7 @@ static void setVideoSurface(const sp<MediaPlayer>& mp, JNIEnv *env, jobject thiz jobject surface = env->GetObjectField(thiz, fields.surface); if (surface != NULL) { const sp<Surface>& native_surface = get_surface(env, surface); - LOGV("prepare: surface=%p (id=%d)", + LOGV("prepare: surface=%p (id=%d)", native_surface.get(), native_surface->ID()); mp->setVideoSurface(native_surface); } @@ -243,7 +243,7 @@ android_media_MediaPlayer_prepareAsync(JNIEnv *env, jobject thiz) jobject surface = env->GetObjectField(thiz, fields.surface); if (surface != NULL) { const sp<Surface>& native_surface = get_surface(env, surface); - LOGV("prepareAsync: surface=%p (id=%d)", + LOGV("prepareAsync: surface=%p (id=%d)", native_surface.get(), native_surface->ID()); mp->setVideoSurface(native_surface); } @@ -271,7 +271,7 @@ android_media_MediaPlayer_stop(JNIEnv *env, jobject thiz) jniThrowException(env, "java/lang/IllegalStateException", NULL); return; } - process_media_player_call( env, thiz, mp->stop(), NULL, NULL ); + process_media_player_call( env, thiz, mp->stop(), NULL, NULL ); } static void |