[Android] libvlc: MediaPlayer: rename playerNativate to navigate

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jun 25 15:53:41 2015 +0200| [5966c0213eae3d24c4fd748921799ead70306049] | committer: Thomas Guillem

libvlc: MediaPlayer: rename playerNativate to navigate

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

 libvlc/jni/libvlcjni-mediaplayer.c                            |    2 +-
 libvlc/src/org/videolan/libvlc/MediaPlayer.java               |    2 +-
 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java   |    9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libvlc/jni/libvlcjni-mediaplayer.c b/libvlc/jni/libvlcjni-mediaplayer.c
index f72a9d2..fb93295 100644
--- a/libvlc/jni/libvlcjni-mediaplayer.c
+++ b/libvlc/jni/libvlcjni-mediaplayer.c
@@ -625,7 +625,7 @@ Java_org_videolan_libvlc_MediaPlayer_getTitleCount(JNIEnv *env, jobject thiz)
 }
 
 void
-Java_org_videolan_libvlc_MediaPlayer_playerNavigate(JNIEnv *env, jobject thiz,
+Java_org_videolan_libvlc_MediaPlayer_navigate(JNIEnv *env, jobject thiz,
                                                     jint navigate)
 {
     vlcjni_object *p_obj = VLCJniObject_getInstance(env, thiz);
diff --git a/libvlc/src/org/videolan/libvlc/MediaPlayer.java b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
index 43de225..66029e6 100644
--- a/libvlc/src/org/videolan/libvlc/MediaPlayer.java
+++ b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
@@ -282,7 +282,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> implements AWindow
     public native int nextChapter();
     public native void setChapter(int chapter);
     public native int getTitleCount();
-    public native void playerNavigate(int navigate);
+    public native void navigate(int navigate);
 
     public native int getAudioTracksCount();
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index ca53186..2d19591 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -1060,22 +1060,21 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
     private boolean navigateDvdMenu(int keyCode) {
         switch (keyCode) {
             case KeyEvent.KEYCODE_DPAD_UP:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Up);
+                MediaPlayer().navigate(MediaPlayer.Navigate.Up);
                 return true;
             case KeyEvent.KEYCODE_DPAD_DOWN:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Down);
+                MediaPlayer().navigate(MediaPlayer.Navigate.Down);
                 return true;
             case KeyEvent.KEYCODE_DPAD_LEFT:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Left);
+                MediaPlayer().navigate(MediaPlayer.Navigate.Left);
                 return true;
             case KeyEvent.KEYCODE_DPAD_RIGHT:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Right);
+                MediaPlayer().navigate(MediaPlayer.Navigate.Right);
                 return true;
             case KeyEvent.KEYCODE_DPAD_CENTER:
             case KeyEvent.KEYCODE_ENTER:
             case KeyEvent.KEYCODE_BUTTON_X:
             case KeyEvent.KEYCODE_BUTTON_A:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Activate);
                 return true;
             default:
                 return false;