<div dir="ltr">LGTM</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 6, 2014 at 10:01 AM, Thomas Guillem <span dir="ltr"><<a href="mailto:thomas@gllm.fr" target="_blank">thomas@gllm.fr</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
.../org/videolan/vlc/gui/video/VideoPlayerActivity.java | 15 +++++++++------<br>
1 file changed, 9 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
index 1d072c5..c08a95e 100644<br>
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
@@ -191,6 +191,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {<br>
private boolean mIsLocked = false;<br>
private int mLastAudioTrack = -1;<br>
private int mLastSpuTrack = -2;<br>
+ private int mOverlayTimeout = 0;<br>
<br>
/**<br>
* For uninterrupted switching between audio and video mode<br>
@@ -1872,7 +1873,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {<br>
* show overlay the the default timeout<br>
*/<br>
private void showOverlay() {<br>
- showOverlay(mLibVLC.isPlaying() ? OVERLAY_TIMEOUT : OVERLAY_INFINITE);<br>
+ showOverlay(0);<br>
}<br>
<br>
@TargetApi(Build.VERSION_CODES.HONEYCOMB)<br>
@@ -1887,6 +1888,10 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {<br>
* show overlay<br>
*/<br>
private void showOverlay(int timeout) {<br>
+ if (timeout != 0)<br>
+ mOverlayTimeout = timeout;<br>
+ if (mOverlayTimeout == 0)<br>
+ mOverlayTimeout = mLibVLC.isPlaying() ? OVERLAY_TIMEOUT : OVERLAY_INFINITE;<br>
if (mIsNavMenu)<br>
return;<br>
mHandler.sendEmptyMessage(SHOW_PROGRESS);<br>
@@ -1905,11 +1910,9 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {<br>
mOverlayProgress.setVisibility(View.VISIBLE);<br>
if (mPresentation != null) mOverlayBackground.setVisibility(View.VISIBLE);<br>
}<br>
- if (timeout != 0) {<br>
- mHandler.removeMessages(FADE_OUT);<br>
- if (timeout != OVERLAY_INFINITE)<br>
- mHandler.sendMessageDelayed(mHandler.obtainMessage(FADE_OUT), timeout);<br>
- }<br>
+ mHandler.removeMessages(FADE_OUT);<br>
+ if (mOverlayTimeout != OVERLAY_INFINITE)<br>
+ mHandler.sendMessageDelayed(mHandler.obtainMessage(FADE_OUT), mOverlayTimeout);<br>
updateOverlayPausePlay();<br>
}<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.1.1<br>
<br>
_______________________________________________<br>
Android mailing list<br>
<a href="mailto:Android@videolan.org">Android@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/android" target="_blank">https://mailman.videolan.org/listinfo/android</a><br>
</font></span></blockquote></div><br></div>