[Android] jni: control playback with media_player and remove media_list_player
Edward Wang
git at videolan.org
Wed Jul 24 06:38:58 CEST 2013
vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Jul 21 14:27:39 2013 -0400| [24d71df7f1a6b20132b616136cef830690cbea39] | committer: Sébastien Toque
jni: control playback with media_player and remove media_list_player
Ref #8895
Signed-off-by: Sébastien Toque <xilasz at gmail.com>
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=24d71df7f1a6b20132b616136cef830690cbea39
---
vlc-android/jni/libvlcjni.c | 66 ++++++++++++-----------
vlc-android/src/org/videolan/libvlc/LibVLC.java | 4 +-
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index e13cba5..dfbfd76 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -180,22 +180,14 @@ static libvlc_media_player_t *getMediaPlayer(JNIEnv *env, jobject thiz)
return (libvlc_media_player_t*)(intptr_t)getLong(env, thiz, "mInternalMediaPlayerInstance");
}
-static libvlc_media_list_player_t *getMediaListPlayer(JNIEnv *env, jobject thiz)
-{
- return (libvlc_media_list_player_t*)(intptr_t)getLong(env, thiz, "mMediaListPlayerInstance");
-}
-
static void releaseMediaPlayer(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t* p_mlp = getMediaListPlayer(env, thiz);
- if (p_mlp)
+ libvlc_media_player_t* p_mp = getMediaPlayer(env, thiz);
+ if (p_mp)
{
- libvlc_media_list_player_stop(p_mlp);
- libvlc_media_list_player_release(p_mlp);
- /* libvlc_media_list_player_release frees the media player, so
- * we don't free it ourselves. */
+ libvlc_media_player_stop(p_mp);
+ libvlc_media_player_release(p_mp);
setLong(env, thiz, "mInternalMediaPlayerInstance", 0);
- setLong(env, thiz, "mMediaListPlayerInstance", 0);
}
}
@@ -677,7 +669,6 @@ static void create_player_and_play(JNIEnv* env, jobject thiz,
libvlc_media_list_t* p_mlist = getMediaList(env, thiz);
/* Create a media player playing environment */
- libvlc_media_list_player_t* p_mlp = libvlc_media_list_player_new((libvlc_instance_t*)(intptr_t)instance);
libvlc_media_player_t *mp = libvlc_media_player_new((libvlc_instance_t*)(intptr_t)instance);
jobject myJavaLibVLC = (*env)->NewGlobalRef(env, thiz);
@@ -706,14 +697,16 @@ static void create_player_and_play(JNIEnv* env, jobject thiz,
for(int i = 0; i < (sizeof(mp_events) / sizeof(*mp_events)); i++)
libvlc_event_attach(ev, mp_events[i], vlc_event_callback, myVm);
- libvlc_media_list_player_set_media_list(p_mlp, p_mlist);
- libvlc_media_list_player_set_media_player(p_mlp, mp);
/* Keep a pointer to this media player */
- setLong(env, thiz, "mMediaListPlayerInstance", (jlong)(intptr_t)p_mlp);
setLong(env, thiz, "mInternalMediaPlayerInstance", (jlong)(intptr_t)mp);
- libvlc_media_list_player_play_item_at_index(p_mlp, position);
+ setInt(env, thiz, "mInternalMediaPlayerIndex", (jint)position);
+ libvlc_media_list_lock(p_mlist);
+ libvlc_media_t* p_md = libvlc_media_list_item_at_index(p_mlist, position);
+ libvlc_media_list_unlock(p_mlist);
+ libvlc_media_player_set_media(mp, p_md);
+ libvlc_media_player_play(mp);
}
jint Java_org_videolan_libvlc_LibVLC_readMedia(JNIEnv *env, jobject thiz,
@@ -1002,14 +995,14 @@ end:
jboolean Java_org_videolan_libvlc_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
{
- return !!getMediaListPlayer(env, thiz);
+ return !!getMediaPlayer(env, thiz);
}
jboolean Java_org_videolan_libvlc_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
+ libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
- return !!libvlc_media_list_player_is_playing(mp);
+ return !!libvlc_media_player_is_playing(mp);
else
return 0;
}
@@ -1024,37 +1017,46 @@ jboolean Java_org_videolan_libvlc_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
void Java_org_videolan_libvlc_LibVLC_play(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
+ libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
- libvlc_media_list_player_play(mp);
+ libvlc_media_player_play(mp);
}
void Java_org_videolan_libvlc_LibVLC_pause(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
+ libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
- libvlc_media_list_player_pause(mp);
+ libvlc_media_player_pause(mp);
}
void Java_org_videolan_libvlc_LibVLC_stop(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
+ libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
- libvlc_media_list_player_stop(mp);
+ libvlc_media_player_stop(mp);
}
void Java_org_videolan_libvlc_LibVLC_previous(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
- if (mp)
- libvlc_media_list_player_previous(mp);
+ int current_position = getInt(env, thiz, "mInternalMediaPlayerIndex");
+
+ if(current_position-1 >= 0) {
+ setInt(env, thiz, "mInternalMediaPlayerIndex", (jint)(current_position-1));
+ create_player_and_play(env, thiz,
+ getLong(env, thiz, "mLibVlcInstance"), current_position-1);
+ }
}
void Java_org_videolan_libvlc_LibVLC_next(JNIEnv *env, jobject thiz)
{
- libvlc_media_list_player_t *mp = getMediaListPlayer(env, thiz);
- if (mp)
- libvlc_media_list_player_next(mp);
+ libvlc_media_list_t* p_mlist = getMediaList(env, thiz);
+ int current_position = getInt(env, thiz, "mInternalMediaPlayerIndex");
+
+ if(current_position+1 < libvlc_media_list_count(p_mlist)) {
+ setInt(env, thiz, "mInternalMediaPlayerIndex", (jint)(current_position+1));
+ create_player_and_play(env, thiz,
+ getLong(env, thiz, "mLibVlcInstance"), current_position+1);
+ }
}
jint Java_org_videolan_libvlc_LibVLC_getVolume(JNIEnv *env, jobject thiz)
diff --git a/vlc-android/src/org/videolan/libvlc/LibVLC.java b/vlc-android/src/org/videolan/libvlc/LibVLC.java
index ea9ccf1..b47f9d4 100644
--- a/vlc-android/src/org/videolan/libvlc/LibVLC.java
+++ b/vlc-android/src/org/videolan/libvlc/LibVLC.java
@@ -38,8 +38,8 @@ public class LibVLC {
/** libVLC instance C pointer */
private long mLibVlcInstance = 0; // Read-only, reserved for JNI
- /** libvlc_media_list_player pointer */
- private long mMediaListPlayerInstance = 0; // Read-only, reserved for JNI
+ /** libvlc_media_player pointer and index */
+ private int mInternalMediaPlayerIndex = 0; // Read-only, reserved for JNI
private long mInternalMediaPlayerInstance = 0; // Read-only, reserved for JNI
/** libvlc_media_list_t pointer */
private long mMediaListInstance = 0; // Read-only, reserved for JNI
More information about the Android
mailing list