[Android] VideoPlayerActivity: clarify variable redux
Edward Wang
git at videolan.org
Mon Jul 7 03:42:00 CEST 2014
vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Jul 6 21:41:21 2014 -0400| [4776d85936a7261891ab24bb1e239d4f12b4419e] | committer: Edward Wang
VideoPlayerActivity: clarify variable redux
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=4776d85936a7261891ab24bb1e239d4f12b4419e
---
.../org/videolan/vlc/gui/video/VideoPlayerActivity.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 1d97343..4e2cb83 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -236,7 +236,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
// Navigation handling (DVD, Blu-Ray...)
private ImageButton mNavMenu;
- private boolean mHasChapters = false;
+ private boolean mHasMenu = false;
private boolean mIsNavMenu = false;
@Override
@@ -830,7 +830,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
case EventHandler.MediaParsedChanged:
Log.i(TAG, "MediaParsedChanged");
activity.updateNavStatus();
- if (!activity.mHasChapters && activity.mLibVLC.getVideoTracksCount() < 1) {
+ if (!activity.mHasMenu && activity.mLibVLC.getVideoTracksCount() < 1) {
Log.i(TAG, "No video track, open in audio mode");
activity.switchToAudioMode();
}
@@ -860,7 +860,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
break;
case EventHandler.MediaPlayerVout:
activity.updateNavStatus();
- if (!activity.mHasChapters)
+ if (!activity.mHasMenu)
activity.handleVout(msg);
break;
case EventHandler.MediaPlayerPositionChanged:
@@ -2228,8 +2228,8 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
}
private void updateNavStatus() {
- mHasChapters = mLibVLC.getChapterCountForTitle(0) > 1;
- mIsNavMenu = mHasChapters && mLibVLC.getTitle() == 0 && mLibVLC.getTitleCount() > 1;
+ mHasMenu = mLibVLC.getChapterCountForTitle(0) > 1;
+ mIsNavMenu = mHasMenu && mLibVLC.getTitle() == 0 && mLibVLC.getTitleCount() > 1;
/***
* HACK ALERT: assume that any media with >1 titles = DVD with menus
* Should be replaced with a more robust title/chapter selection popup
@@ -2246,7 +2246,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
*/
hideOverlay(false);
}
- else if (mHasChapters) {
+ else if (mHasMenu) {
setESTrackLists(true);
setESTracks();
More information about the Android
mailing list