Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Geoffrey Métais
VLC-Android
Commits
2e302e6e
Commit
2e302e6e
authored
Apr 19, 2018
by
Geoffrey Métais
Browse files
TV: Prevent NPE in video player
parent
53c1c33b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @
2e302e6e
...
...
@@ -972,7 +972,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
}
public
boolean
dispatchGenericMotionEvent
(
MotionEvent
event
)
{
return
!
mIsLoading
&&
mTouchDelegate
.
dispatchGenericMotionEvent
(
event
);
return
!
mIsLoading
&&
mTouchDelegate
!=
null
&&
mTouchDelegate
.
dispatchGenericMotionEvent
(
event
);
}
@Override
...
...
@@ -1262,7 +1262,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
}
public
void
showDelayControls
(){
mTouchDelegate
.
clearTouchAction
();
if
(
mTouchDelegate
!=
null
)
mTouchDelegate
.
clearTouchAction
();
if
(!
mDisplayManager
.
isPrimary
())
showOverlayTimeout
(
OVERLAY_INFINITE
);
ViewStubCompat
vsc
=
findViewById
(
R
.
id
.
player_overlay_settings_stub
);
if
(
vsc
!=
null
)
{
...
...
@@ -1594,7 +1594,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
if
(
event
.
getBuffering
()
==
100
f
)
stopLoading
();
else
if
(!
mHandler
.
hasMessages
(
LOADING_ANIMATION
)
&&
!
mIsLoading
&&
!
mTouchDelegate
.
isSeeking
()
&&
!
mDragging
)
&&
(
mTouchDelegate
==
null
||
!
mTouchDelegate
.
isSeeking
()
)
&&
!
mDragging
)
mHandler
.
sendEmptyMessageDelayed
(
LOADING_ANIMATION
,
LOADING_ANIMATION_DELAY
);
break
;
}
...
...
@@ -1968,7 +1968,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
@Override
public
boolean
onTouchEvent
(
MotionEvent
event
)
{
return
mService
!=
null
&&
mTouchDelegate
.
onTouchEvent
(
event
);
return
mService
!=
null
&&
mTouchDelegate
!=
null
&&
mTouchDelegate
.
onTouchEvent
(
event
);
}
boolean
updateViewpoint
(
float
yaw
,
float
pitch
,
float
fov
)
{
...
...
@@ -2563,7 +2563,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
mHudBinding
.
progressOverlay
.
setLayoutParams
(
layoutParams
);
mOverlayBackground
=
findViewById
(
R
.
id
.
player_overlay_background
);
mNavMenu
=
findViewById
(
R
.
id
.
player_overlay_navmenu
);
if
(!
AndroidDevices
.
isChromeBook
&&
AndroidUtil
.
isJellyBeanMR1OrLater
)
{
if
(!
AndroidDevices
.
isChromeBook
&&
AndroidUtil
.
isJellyBeanMR1OrLater
&&
!
VLCApplication
.
showTvUi
()
)
{
mRendererBtn
=
findViewById
(
R
.
id
.
video_renderer
);
RendererDelegate
.
INSTANCE
.
getSelectedRenderer
().
observe
(
this
,
new
Observer
<
RendererItem
>()
{
@Override
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment