Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
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
53c6fdd4
Commit
53c6fdd4
authored
2 years ago
by
Duncan McNamara
Committed by
Nicolas Pomepuy
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
TvBrowser: check FORCE_PLAY_ALL before play
parent
6a45d2c3
No related branches found
Branches containing commit
Tags
3.2.0-b1
Tags containing commit
1 merge request
!1485
TvBrowser: check FORCE_PLAY_ALL before play
Pipeline
#252464
passed with stage
in 21 minutes and 35 seconds
Changes
1
Pipelines
6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/television/src/main/java/org/videolan/television/ui/TvUtil.kt
+9
-3
9 additions, 3 deletions
...vision/src/main/java/org/videolan/television/ui/TvUtil.kt
with
9 additions
and
3 deletions
application/television/src/main/java/org/videolan/television/ui/TvUtil.kt
+
9
−
3
View file @
53c6fdd4
...
...
@@ -46,7 +46,9 @@ import org.videolan.television.ui.audioplayer.AudioPlayerActivity
import
org.videolan.television.ui.browser.TVActivity
import
org.videolan.television.ui.browser.VerticalGridActivity
import
org.videolan.television.ui.details.MediaListActivity
import
org.videolan.tools.FORCE_PLAY_ALL
import
org.videolan.tools.HttpImageLoader
import
org.videolan.tools.Settings
import
org.videolan.tools.getposition
import
org.videolan.vlc.R
import
org.videolan.vlc.gui.DialogActivity
...
...
@@ -202,9 +204,13 @@ object TvUtil {
}
else
->
{
model
.
run
{
val
list
=
(
dataset
.
getList
().
filterIsInstance
<
MediaWrapper
>()).
filter
{
it
.
type
!=
MediaWrapper
.
TYPE_DIR
}
val
position
=
list
.
getposition
(
item
)
MediaUtils
.
openList
(
activity
,
list
,
position
)
if
(!
Settings
.
getInstance
(
activity
).
getBoolean
(
FORCE_PLAY_ALL
,
false
))
{
MediaUtils
.
openMedia
(
activity
,
item
)
}
else
{
val
list
=
(
dataset
.
getList
().
filterIsInstance
<
MediaWrapper
>()).
filter
{
it
.
type
!=
MediaWrapper
.
TYPE_DIR
}
val
position
=
list
.
getposition
(
item
)
MediaUtils
.
openList
(
activity
,
list
,
position
)
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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