external VLC

Author: syd711

RELEASE_NOTES.md

@@ -2,8 +2,10 @@
 
 ## Changes (including a breaking one!)
 
-- **Pause Menu Settings**: Added separate section for the screenshot preferences there. You can choose now which screens are taken for the screenshot. Note that **you need to review these settings** so that the scoring screenshot works as expected and contains your highscore.
-- **Tutorials Video Player**: The video playback uses the **VLC Media Player** from PinUP Popper now (when found).
+- **Pause Menu**: 
+  - Added separate section for the screenshot preferences there. You can choose now which screens are taken for the screenshot. Note that **you need to review these settings** so that the scoring screenshot works as expected and contains your highscore.
+  - Tutorials Video**: The video playback uses the **VLC Media Player** from PinUP Popper now (when found). This is a first test ballon and might need some refinement. But at least the video playback is now reliable. The VLC player is not shipped with the Studio due to license restrictions.
+  - The videos are played on a separate screen, the "Mute System" option is ignored so that the video is always played with sound.
 - **Asset Manager**: 
   - Fixed possible file lock caused by the media streaming that prohibited the deletion (blind fix).
   - Added same support for playlist media than game media (drag/drop, rename, set as default, delete, conversion...).

resources/vpsdb.json

@@ -78,17 +78,20 @@ else if (store.containsKey("vlc.installationDir")) {
           List<String> cmds = new ArrayList<>(List.of("vlc.exe",
               "\"" + asset.getUrl().toExternalForm() + "\"",
               "--mouse-hide-timeout=0",
-              "--dummy-quiet",
               "--intf", "rc",
+              "--intf", "dummy",
               "--rc-quiet",
               "--no-qt-privacy-ask",
               "--reset-plugins-cache",
               "--ignore-config",
+              "--aout=directsound",
+              "--directx-audio-device=default",
               "--no-stats",
               "--no-media-library",
               "--no-video-deco",
               "--no-video-title-show",
               "--qt-minimal-view",
+              "--video-on-top",
               "--no-qt-name-in-title",
               "--no-qt-fs-controller",
               "--video-x=" + screenStageX,
@@ -97,6 +100,8 @@ else if (store.containsKey("vlc.installationDir")) {
               "--height=" + height
           ));
 
+          LOG.info("VLC is playing: {}", asset.getUrl().toExternalForm());
+          LOG.info("VLC command: {}", String.join(" ", cmds));
           if (rotation != 0) {
             cmds.add("--video-filter=transform");
             cmds.add("--transform-type=" + rotation);

vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/StudioMediaPlayer.java

@@ -288,7 +288,7 @@ public void togglePauseMenu(@Nullable GameStatus status, boolean test) {
           Boolean isMuted = WindowsVolumeControl.isMuted();
           alreadyMuted = isMuted != null && isMuted;
 
-          if (pauseMenuSettings.isMuteOnPause() && !alreadyMuted) {
+          if (pauseMenuSettings.isMuteOnPause() && !alreadyMuted && !pauseMenuSettings.isTutorialsOnScreen()) {
             NirCmd.muteSystem(true);
           }
           return true;
@@ -348,7 +348,7 @@ public void exitPauseMenu() {
         NirCmd.focusWindow("Visual Pinball Player");
       }
 
-      if (pauseMenuSettings.isMuteOnPause() && !alreadyMuted) {
+      if (pauseMenuSettings.isMuteOnPause() && !alreadyMuted && !pauseMenuSettings.isTutorialsOnScreen()) {
         NirCmd.muteSystem(false);
       }
     }

vpin-studio-commons/src/main/java/de/mephisto/vpin/commons/fx/pausemenu/PauseMenu.java

@@ -409,7 +409,22 @@
                                     <ToggleGroup fx:id="tutorialScreenGroup" />
                                  </toggleGroup>
                               </RadioButton>
-                              <RadioButton fx:id="tutorialScreenRadio" layoutX="10.0" layoutY="43.0" mnemonicParsing="false" styleClass="default-text" text="Display Tutorial Videos on VPin Screen" toggleGroup="$tutorialScreenGroup" />
+                              <HBox alignment="CENTER_LEFT" spacing="6.0">
+                                 <children>
+                                    <RadioButton fx:id="tutorialScreenRadio" mnemonicParsing="false" styleClass="default-text" text="Display Tutorial Videos on VPin Screen" toggleGroup="$tutorialScreenGroup" />
+                                    <Label fx:id="publicReadAPIHint11111" textFill="WHITE">
+                                       <font>
+                                          <Font size="14.0" />
+                                       </font>
+                                       <graphic>
+                                          <FontIcon iconColor="WHITE" iconLiteral="mdi2h-help-circle-outline" iconSize="18" />
+                                       </graphic>
+                                       <tooltip>
+                                          <Tooltip prefWidth="300.0" text="If you use PinUP Popper as frontend for your cabinet, this is the recommended setting." wrapText="true" />
+                                       </tooltip>
+                                    </Label>
+                                 </children>
+                              </HBox>
                               <ComboBox fx:id="screenTutorialComboBox" prefWidth="250.0">
                                  <VBox.margin>
                                     <Insets left="24.0" />