From 42749798fdbd235ea4e7c773a4aa0f400f7f5ff3 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 16 Jul 2023 20:17:01 +0000
Subject: [PATCH] Fix mplayer to include a start script and show available
 playlists in ES rather than music since gmu only loads those on start.

---
 config/emulators/music.conf                      |  4 ++--
 .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md       |  2 +-
 .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md      |  2 +-
 .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md      |  2 +-
 .../RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md  |  2 +-
 .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md      |  2 +-
 .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md      |  2 +-
 .../S922X/SUPPORTED_EMULATORS_AND_CORES.md       |  2 +-
 packages/jelos/sources/post-update               | 11 +++++++++++
 packages/multimedia/gmu/package.mk               |  5 +++--
 packages/multimedia/gmu/scripts/start_gmu.sh     | 16 ++++++++++++++--
 packages/virtual/emulators/package.mk            |  3 +++
 12 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/config/emulators/music.conf b/config/emulators/music.conf
index 1ce720581..144dcc2a8 100644
--- a/config/emulators/music.conf
+++ b/config/emulators/music.conf
@@ -3,8 +3,8 @@ SYSTEM_FULLNAME="Music Player"
 SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="unknown"
 SYSTEM_HARDWARE="system"
-SYSTEM_PATH="/storage/roms/music"
-SYSTEM_EXTENSION=".flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA"
+SYSTEM_PATH="/storage/.config/gmu/playlists"
+SYSTEM_EXTENSION=".m3u .M3U .sh .SH" 
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="music"
 SYSTEM_THEME="music"
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
index 466ee673c..fbd113943 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
index 999c7bb08..71a7b8e00 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
index 41bbde9e1..47c17764a 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
index 246c31f25..0c156099b 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
index 246c31f25..0c156099b 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
index 5f9ffc7a2..687495228 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
index 745609476..8bce85a9c 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
@@ -38,7 +38,7 @@ This document describes all available systems emulators and cores available for
 |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .zip .ZIP|**retroarch:** mojozork (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh .SH||
 |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH .mp3 .MP3 .aac .AAC .mka .MKA .dts .DTS .flac .FLAC .ogg .OGG .m4a .M4A .ac3 .AC3 .opus .OPUS .wav .WAV .wv .WV .eac3 .EAC3 .thd .THD|**mplayer:** mplayer (default)<br>|
-|JELOS|Music Player (music)|unknown|`music`|.flac .FLAC .mod .MOD .xm .XM .it .IT .669 .669 .s3m .S3M .amf .AMF .ams .AMS .dbm .DBM .dmf .DMF .dsm .DSM .far .FAR .mdl .MDL .med .MED .mtm .MTM .okt .OKT .ptm .PTM .stm .STM .ult .ULT .umx .UMX .mt2 .MT2 .psm .PSM .mid .MID .midi .MIDI .mp3 .MP3 .mp2 .MP2 .mp1 .MP1 .opus .OPUS .ogg .OGG .oga .OGA|**gmu:** gmu (default)<br>|
+|JELOS|Music Player (music)|unknown|`playlists`|.m3u .M3U .sh .SH|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh .SH||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update
index 6969051f5..80f4a54e2 100644
--- a/packages/jelos/sources/post-update
+++ b/packages/jelos/sources/post-update
@@ -170,3 +170,14 @@ sed -i 's#<string name="PowerSaverMode".*$#<string name="PowerSaverMode" value="
 
 ### Remove properties containing "auto" from the system config.
 sed -i "/^.*=auto/d" /storage/.config/system/configs/system.cfg
+
+### Fix up music player to start selection
+if [ -d "/storage/.local/share/gmu" ]
+then
+  rm -rf /storage/.local/share/gmu
+fi
+if [ ! -d "/storage/.config/gmu/playlists" ]
+then
+  mkdir -p /storage/.config/gmu/playlists
+fi
+cp -rf /usr/config/gmu/playlists/* /storage/.config/gmu/playlists/
diff --git a/packages/multimedia/gmu/package.mk b/packages/multimedia/gmu/package.mk
index 47945eb11..fbb1b6691 100644
--- a/packages/multimedia/gmu/package.mk
+++ b/packages/multimedia/gmu/package.mk
@@ -18,16 +18,17 @@ configure_target() {
   ./configure --enable=medialib
 }
 
-
 make_target() {
   make
 }
 
 post_makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/config/gmu
+  mkdir -p ${INSTALL}/usr/config/gmu/playlists
   cp -f ${PKG_DIR}/config/gmu.conf ${INSTALL}/usr/config/gmu
 
   mkdir -p ${INSTALL}/usr/bin
   cp -f ${PKG_DIR}/scripts/start_gmu.sh ${INSTALL}/usr/bin
   chmod +x ${INSTALL}/usr/bin/start_gmu.sh
+
+  ln -sf /usr/bin/start_gmu.sh "${INSTALL}/usr/config/gmu/playlists/Start Music Player.sh"
 }
diff --git a/packages/multimedia/gmu/scripts/start_gmu.sh b/packages/multimedia/gmu/scripts/start_gmu.sh
index 6bb004383..b3f9b2509 100644
--- a/packages/multimedia/gmu/scripts/start_gmu.sh
+++ b/packages/multimedia/gmu/scripts/start_gmu.sh
@@ -4,11 +4,18 @@
 
 . /etc/profile
 
-jslisten set "-9 gmu.bin"
+jslisten set "gmu.bin"
 
 GMUPATH="/storage/.config/gmu"
 GMUCONFIG="${GMUPATH}/gmu.conf"
 
+if [ -d "/storage/.local/share/gmu" ]
+then
+  rm -rf /storage/.local/share/gmu
+fi
+
+ln -sf ${GMUPATH}/playlists /storage/.local/share/gmu
+
 FBHEIGHT=$(fbset | awk '/geometry/ {print $2}')
 FBWIDTH=$(fbset | awk '/geometry/ {print $3}')
 
@@ -26,5 +33,10 @@ then
   sed -i "s~SDL.Fullscreen=.*\$~SDL.Fullscreen=no~g" ${GMUCONFIG}
 fi
 
+if [ "${1}" ]
+then
+  PLAYLIST="-l \"${1}\""
+fi
+
 cd /usr/local/share/gmu
-/usr/local/bin/gmu.bin -d /usr/local/etc/gmu -c /storage/.config/gmu/gmu.conf "$1"
+/usr/local/bin/gmu.bin -d /usr/local/etc/gmu -c /storage/.config/gmu/gmu.conf ${PLAYLIST}
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 39c9c47b0..7c49392f1 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -101,6 +101,9 @@ makeinstall_target() {
   ### Add BIOS directory
   add_system_dir /storage/roms/bios
 
+  ### Add music directory
+  add_system_dir /storage/roms/music
+
   ### Apply documentation header
   start_system_doc