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

#173 - Only reload content player on settings changed

parent 0c09e8c5
No related branches found
No related tags found
No related merge requests found
......@@ -69,7 +69,7 @@ class Zone extends Displayable {
}
override def hashCode(): Int = {
val state = Seq(name)
val state = Seq(name, x, y, width, height)
state.map(_.hashCode()).foldLeft(0)((a, b) => 31 * a + b)
}
}
......@@ -11,6 +11,7 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController
import de.tobias.playpad.viewcontroller.option.{IProfileReloadTask, ProfileSettingsTabViewController}
import javafx.application.Platform
import javafx.event.ActionEvent
import javafx.fxml.FXML
import javafx.scene.control._
import javafx.stage.FileChooser
import nativecontentplayerwindows.{ContentPlayerWindow, ContentScreen}
......@@ -20,7 +21,7 @@ import java.net.URI
class ContentPlayerSettingsViewController extends ProfileSettingsTabViewController with IProfileReloadTask {
import javafx.fxml.FXML
private var startZoneHash: Int = _
@FXML var ffmpegButton: Button = _
@FXML var ffmpegTextField: TextField = _
......@@ -154,6 +155,7 @@ class ContentPlayerSettingsViewController extends ProfileSettingsTabViewControll
override def loadSettings(settings: Profile): Unit = {
val configuration = ContentPlayerSettingsViewController.getZoneConfiguration
startZoneHash = configuration.zones.hashCode()
listView.getItems.setAll(configuration.zones)
......@@ -183,9 +185,8 @@ class ContentPlayerSettingsViewController extends ProfileSettingsTabViewControll
configuration.ffprobeExecutable = ffprobeTextField.getText
}
override def needReload(): Boolean = {
true
}
override def needReload(): Boolean = startZoneHash != ContentPlayerSettingsViewController.getZoneConfiguration.zones.hashCode() ||
!listView.getSelectionModel.isEmpty
override def validSettings(): Boolean = {
true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment