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
1b335542
Commit
1b335542
authored
May 11, 2018
by
Geoffrey Métais
Browse files
Video: Do not override service repeat behavior
parent
584bc229
Changes
1
Hide whitespace changes
Inline
Side-by-side
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @
1b335542
...
...
@@ -1522,11 +1522,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
case
MediaPlayer
.
Event
.
Stopped
:
exitOK
();
break
;
case
MediaPlayer
.
Event
.
EndReached
:
/* Don't end the activity if the media has subitems since the next child will be
* loaded by the PlaybackService */
if
(!
mHasSubItems
)
endReached
();
break
;
case
MediaPlayer
.
Event
.
EncounteredError
:
encounteredError
();
break
;
...
...
@@ -1665,29 +1660,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
mTitle
.
setText
(
mw
.
getTitle
());
}
private
void
endReached
()
{
if
(
mService
==
null
)
return
;
if
(
mService
.
getRepeatType
()
==
Constants
.
REPEAT_ONE
){
seek
(
0
);
return
;
}
// if (mService.expand(false) == 0) {
// mHandler.removeMessages(LOADING_ANIMATION);
// mHandler.sendEmptyMessageDelayed(LOADING_ANIMATION, LOADING_ANIMATION_DELAY);
// Log.d(TAG, "Found a video playlist, expanding it");
// mHandler.post(new Runnable() {
// @Override
// public void run() {
// loadMedia();
// }
// });
// }
//Ignore repeat
if
(
mService
.
getRepeatType
()
==
Constants
.
REPEAT_ALL
&&
mService
.
getMediaListSize
()
==
1
)
exitOK
();
}
private
void
encounteredError
()
{
if
(
isFinishing
()
||
mService
.
hasNext
())
return
;
/* Encountered Error, exit player with a message */
...
...
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