Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
ce2abf0a
Commit
ce2abf0a
authored
5 years ago
by
Geoffrey Métais
Committed by
Nicolas Pomepuy
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix video as audio playback resume
Fix
#1086
parent
b00110d1
No related branches found
No related tags found
Loading
Pipeline
#11676
passed with stage
in 4 minutes and 7 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+2
-1
2 additions, 1 deletion
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
with
2 additions
and
1 deletion
vlc-android/src/org/videolan/vlc/media/PlaylistManager.kt
+
2
−
1
View file @
ce2abf0a
...
...
@@ -167,6 +167,7 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
if
(!
audio
&&
position
<
playList
.
size
&&
settings
.
getBoolean
(
VIDEO_PAUSED
,
false
))
{
playList
[
position
].
addFlags
(
AbstractMediaWrapper
.
MEDIA_PAUSED
)
}
if
(
audio
)
playList
[
position
].
addFlags
(
AbstractMediaWrapper
.
MEDIA_FORCE_AUDIO
)
load
(
playList
,
position
,
true
)
loadingLastPlaylist
=
false
if
(!
audio
)
{
...
...
@@ -806,7 +807,7 @@ class PlaylistManager(val service: PlaybackService) : MediaWrapperList.EventList
}
}
internal
fun
isAudioList
()
=
!
player
.
canSwitchToVideo
()
&&
mediaList
.
isAudioList
internal
fun
isAudioList
()
=
!
player
.
isVideoPlaying
()
&&
mediaList
.
isAudioList
}
class
ABRepeat
(
var
start
:
Long
=
-
1L
,
var
stop
:
Long
=
-
1L
)
This diff is collapsed.
Click to expand it.
Geoffrey Métais
@Dekans
mentioned in commit
1ee118fa
·
5 years ago
mentioned in commit
1ee118fa
mentioned in commit 1ee118fa48c1a2e3076970f6f63bdd790972ffad
Toggle commit list
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment