[Android] libvlc: MediaPlayer: set const upper case

Thomas Guillem git at videolan.org
Thu May 28 16:55:15 CEST 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu May 28 16:55:08 2015 +0200| [5a0996be486fee9d6ec112dcca7b3793ed786e4d] | committer: Thomas Guillem

libvlc: MediaPlayer: set const upper case

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

 libvlc/src/org/videolan/libvlc/MediaPlayer.java    |   30 ++++++++++----------
 .../org/videolan/vlc/MediaWrapperListPlayer.java   |    3 +-
 .../vlc/gui/video/VideoPlayerActivity.java         |   10 +++----
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/libvlc/src/org/videolan/libvlc/MediaPlayer.java b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
index 0629560..9d6327b 100644
--- a/libvlc/src/org/videolan/libvlc/MediaPlayer.java
+++ b/libvlc/src/org/videolan/libvlc/MediaPlayer.java
@@ -29,24 +29,24 @@ import java.util.Map;
 public class MediaPlayer extends VLCObject {
 
     public static class Position {
-        public static final int disable = -1;
-        public static final int center = 0;
-        public static final int left = 1;
-        public static final int right = 2;
-        public static final int top = 3;
-        public static final int top_left = 4;
-        public static final int top_right = 5;
-        public static final int bottom = 6;
-        public static final int bottom_left = 7;
-        public static final int bottom_right = 8;
+        public static final int Disable = -1;
+        public static final int Center = 0;
+        public static final int Left = 1;
+        public static final int Right = 2;
+        public static final int Top = 3;
+        public static final int TopLeft = 4;
+        public static final int TopRight = 5;
+        public static final int Bottom = 6;
+        public static final int BottomLeft = 7;
+        public static final int BottomRight = 8;
     }
 
     public static class Navigate {
-        public static final int activate = 0;
-        public static final int up = 1;
-        public static final int down = 2;
-        public static final int left = 3;
-        public static final int right = 4;
+        public static final int Activate = 0;
+        public static final int Up = 1;
+        public static final int Down = 2;
+        public static final int Left = 3;
+        public static final int Right = 4;
     }
 
     private Media mMedia = null;
diff --git a/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java b/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
index 31a8970..9687ab4 100644
--- a/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
@@ -25,7 +25,6 @@ import android.net.Uri;
 
 import java.util.ArrayList;
 
-import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.Media;
 import org.videolan.libvlc.MediaPlayer;
 import org.videolan.vlc.util.VLCInstance;
@@ -73,7 +72,7 @@ public class MediaWrapperListPlayer {
         VLCInstance.getMainMediaPlayer().setMedia(media);
         media.release();
         VLCInstance.getMainMediaPlayer().setEqualizer(VLCOptions.getEqualizer());
-        VLCInstance.getMainMediaPlayer().setVideoTitleDisplay(MediaPlayer.Position.disable, 0);
+        VLCInstance.getMainMediaPlayer().setVideoTitleDisplay(MediaPlayer.Position.Disable, 0);
         VLCInstance.getMainMediaPlayer().play();
     }
 
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 0110db5..cb0c566 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -1082,22 +1082,22 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
     private boolean navigateDvdMenu(int keyCode) {
         switch (keyCode) {
             case KeyEvent.KEYCODE_DPAD_UP:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.up);
+                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Up);
                 return true;
             case KeyEvent.KEYCODE_DPAD_DOWN:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.down);
+                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Down);
                 return true;
             case KeyEvent.KEYCODE_DPAD_LEFT:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.left);
+                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Left);
                 return true;
             case KeyEvent.KEYCODE_DPAD_RIGHT:
-                MediaPlayer().playerNavigate(MediaPlayer.Navigate.right);
+                MediaPlayer().playerNavigate(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);
+                MediaPlayer().playerNavigate(MediaPlayer.Navigate.Activate);
                 return true;
             default:
                 return false;



More information about the Android mailing list