Skip to content
Snippets Groups Projects
Commit 3fd8af3b authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Fix fade out remove error, make fade value update more robust

parent 4bbcb9a8
No related branches found
No related tags found
No related merge requests found
...@@ -87,8 +87,12 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte ...@@ -87,8 +87,12 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
private var showingLastFrame: Boolean = false private var showingLastFrame: Boolean = false
private var isPause: Boolean = false private var isPause: Boolean = false
private val fadeController = new LinearFadeController(value => ContentPluginMain.playerViewController private val fadeController = new LinearFadeController(value => {
.setFadeValue(mediaPlayers(currentPlayingMediaIndex).mediaPlayer, getSelectedZones, value)) if (currentPlayingMediaIndex >= 0) {
ContentPluginMain.playerViewController
.setFadeValue(mediaPlayers(currentPlayingMediaIndex).mediaPlayer, getSelectedZones, value)
}
})
override def getType: String = `type` override def getType: String = `type`
...@@ -134,9 +138,13 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte ...@@ -134,9 +138,13 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
} }
def onEof(): Unit = { def onEof(): Unit = {
if (isFadeActive) {
ContentPluginMain.playerViewController.removeActivePadFromList(getPad.getPadIndex, getSelectedZones)
return
}
if (shouldShowLastFrame() && !showingLastFrame // Only is settings is enabled and not already in last frame state if (shouldShowLastFrame() && !showingLastFrame // Only is settings is enabled and not already in last frame state
&& !pad.getPadSettings.isLoop // Only go to last frame state, is looping is disabled && !pad.getPadSettings.isLoop // Only go to last frame state, is looping is disabled
&& !isFadeActive // Only go to last frame state, if no fade is active (if eof is reached while fade out, the last frame should not be hold)
) { ) {
getPad.setStatus(PadStatus.PAUSE) getPad.setStatus(PadStatus.PAUSE)
showingLastFrame = true showingLastFrame = true
...@@ -149,8 +157,6 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte ...@@ -149,8 +157,6 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
mediaPlayers(currentPlayingMediaIndex).next() mediaPlayers(currentPlayingMediaIndex).next()
return return
} }
ContentPluginMain.playerViewController.removeActivePadFromList(getPad.getPadIndex, getSelectedZones)
} }
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment