[Android] Use libvlc

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 28 14:34:42 2014 +0100| [736cb9978e54756ff138e55648a37915f4305348] | committer: Rafaël Carré

Use libvlc

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=736cb9978e54756ff138e55648a37915f4305348
---

 vlc-android/jni/libvlcjni-medialist.c |    1 +
 vlc-android/jni/libvlcjni-track.c     |    1 +
 vlc-android/jni/libvlcjni.c           |    2 +-
 vlc-android/jni/thumbnailer.c         |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/vlc-android/jni/libvlcjni-medialist.c b/vlc-android/jni/libvlcjni-medialist.c
index 35fe300..f782f96 100644
--- a/vlc-android/jni/libvlcjni-medialist.c
+++ b/vlc-android/jni/libvlcjni-medialist.c
@@ -100,6 +100,7 @@ void Java_org_videolan_libvlc_MediaList_loadPlaylist(JNIEnv *env, jobject thiz,
     pthread_mutex_lock(&monitor->doneMutex);
 
     libvlc_media_player_t* p_mp = libvlc_media_player_new((libvlc_instance_t*)(intptr_t)getLong(env, libvlcJava, "mLibVlcInstance"));
+    libvlc_media_player_set_video_title_display(p_mp, libvlc_position_disable, 0);
     libvlc_event_manager_t* ev = libvlc_media_player_event_manager(p_mp);
     libvlc_event_attach(ev, libvlc_MediaPlayerEndReached, stopped_callback, monitor);
     libvlc_media_player_set_media(p_mp, p_md);
diff --git a/vlc-android/jni/libvlcjni-track.c b/vlc-android/jni/libvlcjni-track.c
index b281c0f..df558ea 100644
--- a/vlc-android/jni/libvlcjni-track.c
+++ b/vlc-android/jni/libvlcjni-track.c
@@ -59,6 +59,7 @@ jboolean Java_org_videolan_libvlc_LibVLC_hasVideoTrack(JNIEnv *env, jobject thiz
     libvlc_media_parse(p_m);
 
     libvlc_media_player_t* p_mp = libvlc_media_player_new_from_media(p_m);
+    libvlc_media_player_set_video_title_display(p_mp, libvlc_position_disable, 0);
 
     struct length_change_monitor* monitor;
     monitor = malloc(sizeof(struct length_change_monitor));
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index 2af5b0a..1dc5383 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -262,7 +262,6 @@ void Java_org_videolan_libvlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
     /* Don't add any invalid options, otherwise it causes LibVLC to crash */
     const char *argv[] = {
         "--no-osd",
-        "--no-video-title-show",
         "--no-stats",
         "--no-plugins-cache",
         "--no-drop-late-frames",
@@ -336,6 +335,7 @@ void Java_org_videolan_libvlc_LibVLC_playMRL(JNIEnv *env, jobject thiz, jlong in
 
     /* Create a media player playing environment */
     libvlc_media_player_t *mp = libvlc_media_player_new((libvlc_instance_t*)(intptr_t)instance);
+    libvlc_media_player_set_video_title_display(mp, libvlc_position_disable, 0);
     jobject myJavaLibVLC = (*env)->NewGlobalRef(env, thiz);
 
     //if AOUT_AUDIOTRACK_JAVA, we use amem
diff --git a/vlc-android/jni/thumbnailer.c b/vlc-android/jni/thumbnailer.c
index 1f65ed7..9bb644c 100644
--- a/vlc-android/jni/thumbnailer.c
+++ b/vlc-android/jni/thumbnailer.c
@@ -155,6 +155,7 @@ jbyteArray Java_org_videolan_libvlc_LibVLC_getThumbnail(JNIEnv *env, jobject thi
 
     /* Create a media player playing environment */
     libvlc_media_player_t *mp = libvlc_media_player_new(libvlc);
+    libvlc_media_player_set_video_title_display(mp, libvlc_position_disable, 0);
 
     libvlc_media_t *m = new_media(instance, env, thiz, filePath, true, false);
     if (m == NULL)