4.6.0

syd711 · syd711 · commit 5fd1eb9c56be · 2026-01-17T09:56:45.000+01:00
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,7 +3,7 @@
 ## Changes
 
 - **Table Validators**: Introduced new table validator which checks if the table has a backglass, but the backglasses are disabled in the VPX settings. (I assume it is an edge case, but can be annoying to trouble-shoot).
-- **ALT Color**: Added support for .cROMc files, which includes uploading and the backup of .cROMc files.
+- **ALT Color**: Added support for .cROMc files, which includes uploading, backup and backup on replace of .cROMc files.
 - **Pause Menu**: 
   - Added rotation option for the tutorials screen.
   - Added margin options to position the tutorials screen pixel perfect.
@@ -23,9 +23,11 @@
 ## Bugfixes
 
 - **Server Startup**: Fixed critical error that lead to a server crash when the **ScreenRes.txt** file location could no be determined.
-- **Table Filtering**: Fixed issue that the media recorder used the filter settings from the table overview.
+- **Media Recorder Table Filtering**: Fixed issue that the media recorder used the filter settings from the table overview.
 - **Table Data Manager**: The "Auto-save" flag for the dialog is not remembered.
 - **Pause Menu**:
   - Fixed screen configuration that can be used for showing the tutorials video (@kongedam It is finally there!).
   - Fixed mute on pause: If the system was already muted, the pause menu does not unmute on exit anymore.
+  - Fixed **iScored** pause menu item that was always ignored.
+  - Added retry attempts in case the video rendering for tutorials fails. Hopefully this fixes the issue that videos are not starting.
 - **Dialogs**: Fixed issue that after releasing changes on dialogs the contents of these were cropped.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.mephisto.vpin</groupId>
     <artifactId>studio</artifactId>
-    <version>4.5.6</version>
+    <version>4.6.0</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/vpin-connector-discord/pom.xml b/vpin-connector-discord/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-connector-github/pom.xml b/vpin-connector-github/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/vpin-connector-iscored/pom.xml b/vpin-connector-iscored/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-connector-vps/pom.xml b/vpin-connector-vps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-connector-wovp/pom.xml b/vpin-connector-wovp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-studio-app/pom.xml b/vpin-studio-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/vpin-studio-commons/pom.xml b/vpin-studio-commons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/FrontendScreenController.java b/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/FrontendScreenController.java
@@ -3,6 +3,7 @@
 import de.mephisto.vpin.commons.fx.pausemenu.model.FrontendScreenAsset;
 import de.mephisto.vpin.restclient.frontend.FrontendPlayerDisplay;
 import de.mephisto.vpin.restclient.system.MonitorInfo;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
@@ -113,18 +114,12 @@ private void showOnDisplay(FrontendScreenAsset asset) throws IOException {
     else if (mimeType.startsWith("video")) {
       imageView.setVisible(false);
 
-      Media media = new Media(asset.getUrl().toExternalForm());
-      MediaPlayer mediaPlayer = new MediaPlayer(media);
-      mediaPlayer.setAutoPlay(true);
-      mediaPlayer.setCycleCount(-1);
-      mediaPlayer.setMute(false);
-
       mediaView.setPreserveRatio(false);
       mediaView.setFitWidth(display.getWidth());
       mediaView.setFitHeight(display.getHeight());
 
-      mediaView.setMediaPlayer(mediaPlayer);
-      asset.setMediaPlayer(mediaPlayer);
+      Media media = new Media(asset.getUrl().toExternalForm());
+      renderMediaPlayer(media, 0);
     }
     else {
       LOG.error("Unsupported mime type for screen asset: " + mimeType);
@@ -144,15 +139,37 @@ else if (mimeType.startsWith("video")) {
       screenStage.setHeight(display.getWidth());
       screenStage.setWidth(display.getHeight());
     }
-    else  if (asset.getRotation() == 180) {
+    else if (asset.getRotation() == 180) {
       screenStage.setY(screenStage.getY() + display.getHeight());
     }
 
     root.setRotate(asset.getRotation());
 
     if (asset.getRotation() == 90 || asset.getRotation() == 270) {
-      root.translateXProperty().setValue(-( display.getHeight() + (display.getHeight()/2)));
+      root.translateXProperty().setValue(-(display.getHeight() + (display.getHeight() / 2)));
+    }
+  }
+
+  private void renderMediaPlayer(Media media, int attempt) {
+    if (attempt == 100) {
+      return;
     }
+    int attemptCount = attempt + 1;
+    MediaPlayer mediaPlayer = new MediaPlayer(media);
+    mediaPlayer.setCycleCount(-1);
+    mediaPlayer.setMute(false);
+    mediaPlayer.setOnError(() -> {
+      LOG.warn("Pause Menu Media player error:{}/{}, URL: {}", mediaPlayer.getError(), attemptCount, mediaPlayer.getMedia().getSource());
+      mediaPlayer.stop();
+      mediaPlayer.dispose();
+      mediaView.setMediaPlayer(null);
+      renderMediaPlayer(media, attemptCount);
+    });
+    mediaView.setMediaPlayer(mediaPlayer);
+
+    Platform.runLater(() -> {
+      mediaPlayer.play();
+    });
   }
 
   public Node getRoot() {
diff --git a/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/pausemenu/model/FrontendScreenAsset.java b/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/pausemenu/model/FrontendScreenAsset.java
@@ -51,14 +51,6 @@ public void setName(String name) {
     this.name = name;
   }
 
-  public MediaPlayer getMediaPlayer() {
-    return mediaPlayer;
-  }
-
-  public void setMediaPlayer(MediaPlayer mediaPlayer) {
-    this.mediaPlayer = mediaPlayer;
-  }
-
   public int getDuration() {
     return duration;
   }
diff --git a/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/pausemenu/model/PauseMenuItemsFactory.java b/vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/pausemenu/model/PauseMenuItemsFactory.java
@@ -55,7 +55,10 @@ public static List<PauseMenuItem> createPauseMenuItems(@NonNull PauseMenuState s
     if (pauseMenuSettings.isShowIscoredScores() && Features.ISCORED_ENABLED) {
       List<CompetitionRepresentation> competitions = client.getCompetitionService().getIScoredSubscriptions();
       for (CompetitionRepresentation competition : competitions) {
-        if (competition.isActive() && competition.getGameId() == game.getId()) {
+        if (competition.isActive()
+            && !StringUtils.isEmpty(game.getExtTableId())
+            && String.valueOf(competition.getVpsTableId()).equalsIgnoreCase(String.valueOf(game.getExtTableId()))
+            && String.valueOf(competition.getVpsTableVersionId()).equals(String.valueOf(game.getExtTableVersionId()))) {
           PauseMenuItem iScoredItem = new PauseMenuItem(PauseMenuItemTypes.iScored, "iScored", "iScored Game Room Scores", new Image(PauseMenu.class.getResourceAsStream("iscored.png")));
           iScoredItem.setCompetition(competition);
           pauseMenuItems.add(iScoredItem);
diff --git a/vpin-studio-rest-client/pom.xml b/vpin-studio-rest-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-studio-server/pom.xml b/vpin-studio-server/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.mephisto.vpin</groupId>
     <artifactId>vpin-studio-server</artifactId>
-    <version>4.5.6</version>
+    <version>4.6.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
diff --git a/vpin-studio-server/src/main/java/de/mephisto/vpin/server/competitions/iscored/IScoredCompetitionSynchronizer.java b/vpin-studio-server/src/main/java/de/mephisto/vpin/server/competitions/iscored/IScoredCompetitionSynchronizer.java
@@ -17,6 +17,7 @@
 import de.mephisto.vpin.server.games.TableStatusChangedEvent;
 import de.mephisto.vpin.server.preferences.PreferenceChangedListener;
 import de.mephisto.vpin.server.preferences.PreferencesService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -145,25 +146,31 @@ private void synchronizeExistingCompetitions(List<Competition> iScoredSubscripti
         continue;
       }
 
-      IScoredGame game = gameRoom.getGameByVps(iScoredSubscription.getVpsTableId(), iScoredSubscription.getVpsTableVersionId());
+      IScoredGame iScoredGame = gameRoom.getGameByVps(iScoredSubscription.getVpsTableId(), iScoredSubscription.getVpsTableVersionId());
 
       //no matching game found in the game room, so it has been removed
-      if (game == null) {
+      if (iScoredGame == null) {
         deleteSubscription(iScoredSubscriptions, iScoredSubscription);
         LOG.info("Deleted competition {} because no matching Game Room game found for VPS table/version: {}/{}", iScoredSubscription, iScoredSubscription.getVpsTableId(), iScoredSubscription.getVpsTableVersionId());
         continue;
       }
 
       IScoredGameRoom iScoredGameRoom = anyGameRoomMatch.get();
-      if (game.isGameHidden() && iScoredGameRoom.isIgnoreHidden()) {
+      if (iScoredGame.isGameHidden() && iScoredGameRoom.isIgnoreHidden()) {
         deleteSubscription(iScoredSubscriptions, iScoredSubscription);
         LOG.info("Deleted competition {} because the matching game is hidden", iScoredSubscription);
         continue;
       }
 
+      if (iScoredGame.isAllVersionsEnabled() && !StringUtils.isEmpty(iScoredSubscription.getVpsTableVersionId())) {
+        deleteSubscription(iScoredSubscriptions, iScoredSubscription);
+        LOG.info("Deleted competition {} because the it has a VPS version id, but all versions are enabled.", iScoredSubscription);
+        continue;
+      }
+
       //get game depending on if versions are enabled.
       Game gameByVpsTable = null;
-      if (game.isAllVersionsEnabled()) {
+      if (iScoredGame.isAllVersionsEnabled()) {
         gameByVpsTable = gameService.getGameByVpsTable(knownGames, iScoredSubscription.getVpsTableId(), null);
       }
       else {
diff --git a/vpin-studio-ui/pom.xml b/vpin-studio-ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/vpin-tools/pom.xml b/vpin-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>de.mephisto.vpin</groupId>
             <artifactId>vpin-studio-rest-client</artifactId>
-            <version>4.5.6</version>
+            <version>4.6.0</version>
         </dependency>
         <dependency>
             <groupId>de.mephisto.vpin</groupId>
diff --git a/vps-bot/pom.xml b/vps-bot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>studio</artifactId>
         <groupId>de.mephisto.vpin</groupId>
-        <version>4.5.6</version>
+        <version>4.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
