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
41e649a9
Commit
41e649a9
authored
6 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Prevent concurrent access in renderers callbacks
parent
0cefd064
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vlc-android/src/org/videolan/vlc/RendererDelegate.kt
+31
-12
31 additions, 12 deletions
vlc-android/src/org/videolan/vlc/RendererDelegate.kt
with
31 additions
and
12 deletions
vlc-android/src/org/videolan/vlc/RendererDelegate.kt
+
31
−
12
View file @
41e649a9
...
...
@@ -22,6 +22,8 @@ package org.videolan.vlc
import
kotlinx.coroutines.experimental.CoroutineStart
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.async
import
kotlinx.coroutines.experimental.channels.Channel
import
kotlinx.coroutines.experimental.channels.actor
import
kotlinx.coroutines.experimental.launch
import
org.videolan.libvlc.RendererDiscoverer
import
org.videolan.libvlc.RendererItem
...
...
@@ -34,8 +36,8 @@ object RendererDelegate : RendererDiscoverer.EventListener, ExternalMonitor.Netw
private
val
TAG
=
"VLC/RendererDelegate"
private
val
mDiscoverers
=
ArrayList
<
RendererDiscoverer
>()
val
renderers
=
ArrayList
<
RendererItem
>()
private
val
mL
isteners
=
LinkedList
<
RendererListener
>()
private
val
mP
layers
=
LinkedList
<
RendererPlayer
>()
private
val
l
isteners
=
LinkedList
<
RendererListener
>()
private
val
p
layers
=
LinkedList
<
RendererPlayer
>()
@Volatile
private
var
started
=
false
var
selectedRenderer
:
RendererItem
?
=
null
...
...
@@ -65,13 +67,13 @@ object RendererDelegate : RendererDiscoverer.EventListener, ExternalMonitor.Netw
}
}
suspend
fun
stop
()
{
fun
stop
()
{
if
(!
started
)
return
started
=
false
for
(
discoverer
in
mDiscoverers
)
discoverer
.
stop
()
clear
()
onRenderersChanged
()
for
(
player
in
mPlayers
)
player
.
on
RendererChanged
(
null
)
cbActor
.
offer
(
RendererChanged
(
null
)
)
}
private
fun
clear
()
{
...
...
@@ -93,20 +95,37 @@ object RendererDelegate : RendererDiscoverer.EventListener, ExternalMonitor.Netw
onRenderersChanged
()
}
fun
addListener
(
listener
:
RendererListener
)
=
m
Listener
s
.
add
(
listener
)
fun
addListener
(
listener
:
RendererListener
)
=
cbActor
.
offer
(
Add
Listener
(
listener
)
)
fun
removeListener
(
listener
:
RendererListener
)
=
mListeners
.
remove
(
listener
)
fun
removeListener
(
listener
:
RendererListener
)
=
cbActor
.
offer
(
RemoveListener
(
listener
)
)
private
fun
onRenderersChanged
()
{
for
(
listener
in
mListeners
)
listener
.
onRenderersChanged
(
renderers
.
isEmpty
())
}
private
fun
onRenderersChanged
()
=
cbActor
.
offer
(
RenderersChanged
())
fun
selectRenderer
(
item
:
RendererItem
?)
{
selectedRenderer
=
item
for
(
player
in
mPlayers
)
player
.
on
RendererChanged
(
item
)
cbActor
.
offer
(
RendererChanged
(
item
)
)
}
fun
addPlayerListener
(
listener
:
RendererPlayer
)
=
mPlayers
.
add
(
listener
)
fun
addPlayerListener
(
player
:
RendererPlayer
)
=
cbActor
.
offer
(
AddPlayer
(
player
))
fun
removePlayerListener
(
player
:
RendererPlayer
)
=
cbActor
.
offer
(
RemovePlayer
(
player
))
fun
removePlayerListener
(
listener
:
RendererPlayer
)
=
mPlayers
.
remove
(
listener
)
private
val
cbActor
=
actor
<
CbAction
>(
UI
,
Channel
.
UNLIMITED
)
{
for
(
action
in
channel
)
when
(
action
)
{
is
AddPlayer
->
players
.
add
(
action
.
player
)
is
RemovePlayer
->
players
.
remove
(
action
.
player
)
is
RendererChanged
->
for
(
player
in
players
)
player
.
onRendererChanged
(
action
.
renderer
)
is
AddListener
->
listeners
.
add
(
action
.
listener
)
is
RemoveListener
->
listeners
.
remove
(
action
.
listener
)
is
RenderersChanged
->
for
(
listener
in
listeners
)
listener
.
onRenderersChanged
(
renderers
.
isEmpty
())
}
}
}
sealed
class
CbAction
private
class
AddPlayer
(
val
player
:
RendererDelegate
.
RendererPlayer
)
:
CbAction
()
private
class
RemovePlayer
(
val
player
:
RendererDelegate
.
RendererPlayer
)
:
CbAction
()
private
class
RendererChanged
(
val
renderer
:
RendererItem
?)
:
CbAction
()
private
class
AddListener
(
val
listener
:
RendererDelegate
.
RendererListener
)
:
CbAction
()
private
class
RemoveListener
(
val
listener
:
RendererDelegate
.
RendererListener
)
:
CbAction
()
private
class
RenderersChanged
:
CbAction
()
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