Merge pull request #225 from andriniaina/mpv

Add MPV media player
knulli-cfw · Dec 21, 2024 · 9accbb1 · 9accbb1
2 parents cff2bd4 + 0e5d461
commit 9accbb1
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 0 deletions.
diff --git a/board/batocera/fsoverlay/etc/init.d/S12populateshare b/board/batocera/fsoverlay/etc/init.d/S12populateshare
@@ -86,6 +86,7 @@ fi
 # the user can delete the directory, it will recreate the structure
 # the user can delete files, files will not be recreated
 for FILE in music bios extractions kodi library saves screenshots recordings splash \
+            roms/mpv \
             system/.config/lirc/lircd.conf \
             system/configs/emulationstation/es_settings.cfg \
             system/configs/emulationstation/about.info \

diff --git a/board/batocera/fsoverlay/usr/share/evmapy/mpv.keys b/board/batocera/fsoverlay/usr/share/evmapy/mpv.keys
@@ -0,0 +1,80 @@
+{
+    "actions_player1": [
+        {
+            "trigger": "up",
+            "type": "key",
+            "target": "KEY_UP"
+        },
+        {
+            "trigger": "down",
+            "type": "key",
+            "target": "KEY_DOWN"
+        },
+        {
+            "trigger": "left",
+            "type": "key",
+            "target": "KEY_LEFT"
+        },
+        {
+            "trigger": "right",
+            "type": "key",
+            "target": "KEY_RIGHT"
+        },
+        {
+            "trigger": "select",
+            "type": "key",
+            "target": "KEY_ESC"
+        },
+        {
+            "trigger": "a",
+            "type": "key",
+            "target": "KEY_SPACE"
+        },
+        {
+            "trigger": [
+                "hotkey",
+                "start"
+            ],
+            "type": "key",
+            "target": "KEY_Q"
+        },
+        {
+            "trigger": "b",
+            "type": "key",
+            "target": "KEY_O"
+        },
+        {
+            "trigger": "joystick1",
+            "type": "mouse"
+        },
+        {
+            "trigger": "joystick2",
+            "type": "mouse"
+        },
+        {
+            "trigger": "pagedown",
+            "type": "key",
+            "target": "KEY_PAGEUP"
+        },
+        {
+            "trigger": "pageup",
+            "type": "key",
+            "target": "KEY_PAGEDOWN"
+        },
+        {
+            "trigger": "l1",
+            "type": "key",
+            "target": ["KEY_LEFTSHIFT", "KEY_PAGEUP"]
+        },
+        {
+            "trigger": "l2",
+            "type": "key",
+            "target": ["KEY_LEFTSHIFT", "KEY_PAGEDOWN"]
+        },
+        {
+            "trigger": "x",
+            "type": "key",
+            "target": "KEY_J"
+        }
+    ]
+}
diff --git a/configs/batocera-a133.board b/configs/batocera-a133.board
@@ -15,8 +15,19 @@ BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
 # batocera splash screen
 BR2_PACKAGE_BATOCERA_SPLASH_MPV=y
 
+BR2_PACKAGE_MPV=y
+
 # Batocera system
 BR2_PACKAGE_BATOCERA_KODI20=n
+#BR2_PACKAGE_BATOCERA_KODI21=n
+#BR2_PACKAGE_FLATBUFFERS=y
+#BR2_PACKAGE_FSTRCMP=y
+#BR2_PACKAGE_LIBASS=y
+#BR2_PACKAGE_LIBCROSSGUID=y
+#BR2_PACKAGE_LIBDRM=y
+#BR2_PACKAGE_LIBPLIST=y
+#BR2_PACKAGE_SPDLOG=y
+#BR2_PACKAGE_TAGLIB=y
 
 # Bootloader
 #BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y

diff --git a/configs/batocera-h700.board b/configs/batocera-h700.board
@@ -17,6 +17,7 @@ BR2_PACKAGE_BATOCERA_SPLASH_MPV=y
 
 # Batocera system
 BR2_PACKAGE_BATOCERA_KODI20=n
+BR2_PACKAGE_MPV=y
 
 # Bootloader
 #BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y

diff --git a/package/batocera/core/batocera-configgen/configgen/configgen/generators/mpv/__init__.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mpv/__init__.py
@@ -0,0 +1 @@
+
diff --git a/package/batocera/core/batocera-configgen/configgen/configgen/generators/mpv/mpvGenerator.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/mpv/mpvGenerator.py
@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from ... import Command
+from ...controller import generate_sdl_game_controller_config, write_sdl_controller_db
+from ..Generator import Generator
+
+if TYPE_CHECKING:
+    from ...types import HotkeysContext
+
+
+class MpvGenerator(Generator):
+
+    def getHotkeysContext(self) -> HotkeysContext:
+        return {
+            "name": "shell",
+            "keys": { "exit": ["KEY_LEFTSHIFT", "KEY_Q"] }
+        }
+
+    def generate(self, system, rom, playersControllers, metadata, guns, wheels, gameResolution):
+        rom_path = Path(rom)
+
+        commandArray = [system.config["emulator"], rom_path, "--fs"]
+        return Command.Command(array=commandArray)
+
+    def getMouseMode(self, config, rom):
+        return True
diff --git a/package/batocera/emulationstation/batocera-es-system/es_systems.yml b/package/batocera/emulationstation/batocera-es-system/es_systems.yml
@@ -2370,6 +2370,57 @@ fmtowns:
     tsugaru:
       tsugaru: { requireAnyOf: [BR2_PACKAGE_TSUGARU], incompatible_extensions: [chd, toc, nrg, gdi, cdr, mfi, dfi, hfe, mfm, td0, imd, 1dd, cqm, cqi, dsk, zip, 7z] }
 
+mpv:
+  name:       mpv
+  manufacturer: Tools
+  release:
+  hardware: tool
+  extensions:
+    - webm
+    - mkv
+    - flv
+    - f4v
+    - f4p
+    - f4a
+    - f4b
+    - vob
+    - ogv
+    - ogg
+    - gif
+    - gifv
+    - mng
+    - avi
+    - mov
+    - qt
+    - wmv
+    - yuv
+    - rm
+    - rmvb
+    - viv
+    - asf
+    - mp4
+    - m4v
+    - m4p
+    - mpg
+    - mp2
+    - mpeg
+    - mpe
+    - mpv
+    - m2v
+    - m4v
+    - svi
+    - 3gp
+    - 3g2
+    - mxf
+    - roq
+    - nsv
+  manufacturer: Misc. System
+  path: mpv
+  command: emulatorlauncher %CONTROLLERSCONFIG% -system %SYSTEM% -rom %ROM% -gameinfoxml %GAMEINFOXML% -systemname %SYSTEMNAME% -emulator mpv
+  emulators:
+    sh:
+      sh:  { requireAnyOf: [ BR2_PACKAGE_MPV ] }
+
 ports:
   name:       Ports
   manufacturer: Ports