Added GMU as a package

FunKey/Config.in

@@ -21,3 +21,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/bibi/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/picoarch/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/clock/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/st-sdl/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/gmu/Config.in"

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/funkey.keymap

@@ -0,0 +1,66 @@
+# Gmu key mappings
+# Required keys: Modifier, Up, 
+# Down, Pause, ProgramInfo, Exit,
+# PlaylistPlayItem, PlaylistClear,
+# FileBrowserAddFileToPlaylistOrChDir
+Modifier=Select
+# Global mappings:
+#Left=Left
+#Right=Right
+Up=Up
+Down=Down
+ShutdownTimer=Mod+Down
+IncreaseVolume=Right
+DecreaseVolume=Left
+ToggleTime=Mod+Left
+Pause=X
+Stop=Mod+X
+ToggleView=Start
+PreviousTrack=L
+NextTrack=R
+SeekForward=Mod+R
+SeekBackward=Mod+L
+Lock=Lock
+Unlock=Unlock
+Exit=Mod+Start
+Help=Mod+Up
+
+# Program info mappings:
+ProgramInfo=Mod+A
+ProgramInfoOkay=A
+# File browser mappings:
+#FileBrowserDirUp=Left
+#FileBrowserChDir=Right
+
+FileBrowserPlayFile=B
+FileBrowserAddFileToPlaylistOrChDir=A
+FileBrowserAddDirToPlaylist=Y
+FileBrowserInsertFileIntoPlaylist=Mod+A
+FileBrowserNewPlFromDir=Mod+Y
+#FileBrowserDeleteFile=Mod+X
+# Playlist mappings:
+PlaylistPlayItem=A
+PlaylistToggleRandomMode=B
+PlaylistRemoveItem=Y
+PlaylistClear=Mod+Y
+PlaylistSave=Mod+B
+# Playlist save dialog:
+PlaylistSaveSelect=A
+PlaylistSaveCancel=B
+PlaylistSaveLoadList=Y
+PlaylistSaveAppendList=Mod+Y
+#PlaylistDeleteFile=Mod+X
+PlaylistQueue=Mod+Right
+# Track info mappings:
+TrackInfoToggleCover=A
+TrackInfoToggleText=B
+# Question dialog mappings: 
+QuestionYes=A
+QuestionNo=B
+# Setup mappings:
+SetupSelect=A
+SetupSaveAndExit=X
+SetupSaveAndRunGmu=Y
+SetupFileBrowserSelect=A
+SetupFileBrowserChDir=A
+SetupFileBrowserCancel=B

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/gmu.dge

@@ -0,0 +1,19 @@
+#!/bin/sh
+cd `dirname $0`
+DEFAULT_CONFIG_FILE="/mnt/FunKey/.config/gmu/gmu.conf"
+while true; do
+	# 运行应用程序
+	if [ -f ${DEFAULT_CONFIG_FILE} ]; then
+		SDL_NOMOUSE=1 ./gmu -c ${DEFAULT_CONFIG_FILE}
+	else
+		SDL_NOMOUSE=1 ./gmu -c gmu.funkey.conf
+	fi
+    
+	# 检查退出状态码,30是表示重新启动
+	if [ $? -eq 30 ]; then
+		echo "Restarting myapp..."
+	else
+		echo "Exiting loop"
+		break
+	fi
+done

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/gmu.funkey.conf

@@ -0,0 +1,47 @@
+Gmu.AutoPlayOnProgramStart=no
+Gmu.DefaultFileBrowserPath=/mnt/Music/
+Gmu.DefaultPlayMode=continue
+Gmu.DeviceCloseASAP=no
+Gmu.FadeOutOnSkip=yes
+Gmu.FileBrowserFoldersFirst=yes
+Gmu.FileSystemCharset=UTF-8
+Gmu.FirstRun=no
+gmuhttp.BaseDir=/mnt/
+gmuhttp.DisableLocalPassword=yes
+gmuhttp.Listen=Local
+gmuhttp.Password=funkey
+Gmu.LastPlayedPlaylistItem=None
+Gmu.LastPlayedPlaylistItemTime=0
+Gmu.PlaylistSavePresets=rock.m3u;pop.m3u;electronic.m3u;classic.m3u;alternative.m3u;soundtrack.m3u;chiptunes.m3u;playlist1.m3u;playlist2.m3u;playlist3.m3u;playlist4.m3u;playlist5.m3u;playlist6.m3u;playlist7.m3u;playlist8.m3u;playlist9.m3u;playlist10.m3u
+Gmu.ReaderCache=512
+Gmu.ReaderCachePrebufferSize=256
+Gmu.RememberLastPlaylist=yes
+Gmu.RememberSettings=yes
+Gmu.ResumePlayback=yes
+Gmu.Shutdown=0
+Gmu.ShutdownCommand=/sbin/poweroff
+Gmu.Volume=11
+Gmu.VolumeControl=Software
+Gmu.VolumeHardwareMixerChannel=0
+Log.Enable=no
+Log.MinimumPlaytimePercent=50
+Log.MinimumPlaytimeSec=30
+SDL.AllowVolumeControlInHoldState=no
+SDL.AutoSelectCurrentPlaylistItem=yes
+SDL.BacklightPowerOnOnTrackChange=no
+SDL.CoverArtworkFilePattern=cover.jpg;cover.png;front.jpg;*.jpg;*.png
+SDL.CoverArtworkLarge=no
+SDL.DefaultSkin=dbcompo
+SDL.EnableCoverArtwork=yes
+SDL.FileBrowserSelectNextAfterAdd=yes
+SDL.Fullscreen=yes
+SDL.Height=240
+SDL.InputConfigFile=gmuinput.funkey.conf
+SDL.KeyMap=funkey.keymap
+SDL.LoadEmbeddedCoverArtwork=first
+SDL.LyricsFilePattern=$.txt;*.txt;*.nfo
+SDL.Scroll=always
+SDL.SecondsUntilBacklightPowerOff=30
+SDL.SmallCoverArtworkAlignment=right
+SDL.TimeDisplay=remaining
+SDL.Width=240

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/gmuinput.funkey.conf

@@ -0,0 +1,15 @@
+FullKeyboard=no
+Button-0=117,Up
+Button-1=100,Down
+Button-2=108,Left
+Button-3=114,Right
+Button-4=115,Select
+Button-5=107,Start
+Button-6=97,A
+Button-7=98,B
+Button-8=120,X
+Button-9=121,Y
+Button-10=110,R
+Button-11=109,L
+Button-12=113,Power
+

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/themes/dbcompo-small/theme.conf

@@ -0,0 +1,72 @@
+# Gmu Theme file
+FormatVersion=2
+
+#Fontsize=10
+Font1Type=bitmap
+Font1=letters_small_white.png
+Font1CharWidth=5
+Font1CharHeight=7
+
+Font2Type=bitmap
+Font2=letters_small_orange.png
+Font2CharWidth=5
+Font2CharHeight=7
+
+Icon.ArrowUp=arrow-up.png
+Icon.ArrowDown=arrow-down.png
+
+Header.ImagePrefix=footer
+Header.PosX1=0
+Header.PosY1=38
+Header.PosX2=0
+Header.PosY2=51
+
+ListView.ImagePrefix=textarea
+ListView.PosX1=0
+ListView.PosY1=51
+ListView.PosX2=0
+ListView.PosY2=-13
+
+Footer.ImagePrefix=footer
+Footer.PosX1=0
+Footer.PosY1=-13
+Footer.PosX2=0
+Footer.PosY2=0
+
+Display.ImagePrefix=display
+Display.PosX1=0
+Display.PosY1=0
+Display.PosX2=0
+Display.PosY2=38
+
+#Display.Fontsize=12
+Display.FontType=bitmap
+Display.Font=letters_large_orange.png
+Display.FontCharWidth=10
+Display.FontCharHeight=14
+
+Display.FontUpperCaseOnly=yes
+
+Display.Symbols=symbols.png
+Display.SymbolsWidth=16
+Display.SymbolsHeight=16
+Display.Symbol.Play.OffsetX=0
+Display.Symbol.Play.OffsetY=2
+Display.Symbol.Pause.OffsetX=13
+Display.Symbol.Pause.OffsetY=2
+Display.Symbol.Stereo.OffsetX=6
+Display.Symbol.Stereo.OffsetY=20
+
+Display.TitleScrollerOffsetY=4
+Display.TitleScrollerOffsetX1=28
+Display.TitleScrollerOffsetX2=0
+Display.PlayPauseOffsetX=5
+Display.PlayPauseOffsetY=3
+Display.VolumeOffsetX=3
+Display.VolumeOffsetY=20
+Display.BitrateOffsetX=28
+Display.BitrateOffsetY=21
+Display.FrequencyOffsetX=138
+Display.FrequencyOffsetY=21
+Display.TimeOffsetX=248
+Display.TimeOffsetY=21

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/themes/dbcompo/theme.conf

@@ -0,0 +1,72 @@
+# Gmu Theme file
+FormatVersion=2
+
+#Fontsize=10
+Font1Type=bitmap
+Font1=letters_large_white.png
+Font1CharWidth=10
+Font1CharHeight=14
+
+Font2Type=bitmap
+Font2=letters_large_orange.png
+Font2CharWidth=10
+Font2CharHeight=14
+
+Icon.ArrowUp=arrow-up.png
+Icon.ArrowDown=arrow-down.png
+
+Header.ImagePrefix=footer
+Header.PosX1=0
+Header.PosY1=38
+Header.PosX2=0
+Header.PosY2=64
+
+ListView.ImagePrefix=textarea
+ListView.PosX1=0
+ListView.PosY1=65
+ListView.PosX2=0
+ListView.PosY2=-26
+
+Footer.ImagePrefix=footer
+Footer.PosX1=0
+Footer.PosY1=-26
+Footer.PosX2=0
+Footer.PosY2=0
+
+Display.ImagePrefix=display
+Display.PosX1=0
+Display.PosY1=0
+Display.PosX2=0
+Display.PosY2=38
+
+#Display.Fontsize=12
+Display.FontType=bitmap
+Display.Font=letters_large_orange.png
+Display.FontCharWidth=10
+Display.FontCharHeight=14
+
+Display.FontUpperCaseOnly=yes
+
+Display.Symbols=symbols.png
+Display.SymbolsWidth=16
+Display.SymbolsHeight=16
+Display.Symbol.Play.OffsetX=0
+Display.Symbol.Play.OffsetY=2
+Display.Symbol.Pause.OffsetX=13
+Display.Symbol.Pause.OffsetY=2
+Display.Symbol.Stereo.OffsetX=6
+Display.Symbol.Stereo.OffsetY=20
+
+Display.TitleScrollerOffsetY=4
+Display.TitleScrollerOffsetX1=28
+Display.TitleScrollerOffsetX2=-5
+Display.PlayPauseOffsetX=5
+Display.PlayPauseOffsetY=3
+Display.VolumeOffsetX=3
+Display.VolumeOffsetY=20
+Display.BitrateOffsetX=26
+Display.BitrateOffsetY=21
+Display.FrequencyOffsetX=136
+Display.FrequencyOffsetY=21
+Display.TimeOffsetX=257
+Display.TimeOffsetY=21

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/themes/default-modern-large/theme.conf

@@ -0,0 +1,72 @@
+# Gmu Theme file
+FormatVersion=2
+
+#Fontsize=10
+Font1Type=bitmap
+Font1=letters_large_white.png
+Font1CharWidth=10
+Font1CharHeight=14
+
+Font2Type=bitmap
+Font2=letters_large_blue.png
+Font2CharWidth=10
+Font2CharHeight=14
+
+Icon.ArrowUp=arrow-up.png
+Icon.ArrowDown=arrow-down.png
+
+Header.ImagePrefix=footer
+Header.PosX1=0
+Header.PosY1=38
+Header.PosX2=0
+Header.PosY2=64
+
+ListView.ImagePrefix=textarea
+ListView.PosX1=0
+ListView.PosY1=65
+ListView.PosX2=0
+ListView.PosY2=-26
+
+Footer.ImagePrefix=footer
+Footer.PosX1=0
+Footer.PosY1=-26
+Footer.PosX2=0
+Footer.PosY2=0
+
+Display.ImagePrefix=display
+Display.PosX1=0
+Display.PosY1=0
+Display.PosX2=0
+Display.PosY2=38
+
+#Display.Fontsize=12
+Display.FontType=bitmap
+Display.Font=letters_lcd_2.png
+Display.FontCharWidth=10
+Display.FontCharHeight=14
+
+Display.FontUpperCaseOnly=yes
+
+Display.Symbols=symbols.png
+Display.SymbolsWidth=16
+Display.SymbolsHeight=16
+Display.Symbol.Play.OffsetX=0
+Display.Symbol.Play.OffsetY=2
+Display.Symbol.Pause.OffsetX=13
+Display.Symbol.Pause.OffsetY=2
+Display.Symbol.Stereo.OffsetX=6
+Display.Symbol.Stereo.OffsetY=20
+
+Display.TitleScrollerOffsetY=4
+Display.TitleScrollerOffsetX1=28
+Display.TitleScrollerOffsetX2=-5
+Display.PlayPauseOffsetX=5
+Display.PlayPauseOffsetY=3
+Display.VolumeOffsetX=3
+Display.VolumeOffsetY=20
+Display.BitrateOffsetX=26
+Display.BitrateOffsetY=21
+Display.FrequencyOffsetX=136
+Display.FrequencyOffsetY=21
+Display.TimeOffsetX=248
+Display.TimeOffsetY=21

FunKey/board/funkey/rootfs-overlay/usr/bin/gmu/themes/default-modern/theme.conf

@@ -0,0 +1,72 @@
+# Gmu Theme file
+FormatVersion=2
+
+#Fontsize=10
+Font1Type=bitmap
+Font1=letters_small_white.png
+Font1CharWidth=5
+Font1CharHeight=7
+
+Font2Type=bitmap
+Font2=letters_small_blue.png
+Font2CharWidth=5
+Font2CharHeight=7
+
+Icon.ArrowUp=arrow-up.png
+Icon.ArrowDown=arrow-down.png
+
+Header.ImagePrefix=footer
+Header.PosX1=0
+Header.PosY1=38
+Header.PosX2=0
+Header.PosY2=51
+
+ListView.ImagePrefix=textarea
+ListView.PosX1=0
+ListView.PosY1=51
+ListView.PosX2=0
+ListView.PosY2=-13
+
+Footer.ImagePrefix=footer
+Footer.PosX1=0
+Footer.PosY1=-13
+Footer.PosX2=0
+Footer.PosY2=0
+
+Display.ImagePrefix=display
+Display.PosX1=0
+Display.PosY1=0
+Display.PosX2=0
+Display.PosY2=38
+
+#Display.Fontsize=12
+Display.FontType=bitmap
+Display.Font=letters_lcd_2.png
+Display.FontCharWidth=10
+Display.FontCharHeight=14
+
+Display.FontUpperCaseOnly=yes
+
+Display.Symbols=symbols.png
+Display.SymbolsWidth=16
+Display.SymbolsHeight=16
+Display.Symbol.Play.OffsetX=0
+Display.Symbol.Play.OffsetY=2
+Display.Symbol.Pause.OffsetX=13
+Display.Symbol.Pause.OffsetY=2
+Display.Symbol.Stereo.OffsetX=6
+Display.Symbol.Stereo.OffsetY=20
+
+Display.TitleScrollerOffsetY=4
+Display.TitleScrollerOffsetX1=28
+Display.TitleScrollerOffsetX2=0
+Display.PlayPauseOffsetX=5
+Display.PlayPauseOffsetY=3
+Display.VolumeOffsetX=3
+Display.VolumeOffsetY=20
+Display.BitrateOffsetX=28
+Display.BitrateOffsetY=21
+Display.FrequencyOffsetX=138
+Display.FrequencyOffsetY=21
+Display.TimeOffsetX=248
+Display.TimeOffsetY=21

FunKey/configs/funkey_defconfig

@@ -122,3 +122,4 @@ BR2_PACKAGE_COMMANDER=y
 BR2_PACKAGE_P7ZIP=y
 BR2_PACKAGE_UNRAR=y
 BR2_PACKAGE_FILE=y
+BR2_PACKAGE_FLAC=y

FunKey/package/gmu/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GMU
+	bool "gmu"
+	default y
+	select BR2_PACKAGE_SDL
+	help
+	A multi-format music player
+
+
+	  https://github.com/jhe2/gmu

FunKey/package/gmu/gmu.mk

@@ -0,0 +1,38 @@
+################################################################################
+#
+# gmu
+#
+################################################################################
+
+GMU_VERSION = v1.0-funkey-s
+GMU_SITE_METHOD = git
+GMU_SITE = https://github.com/DrUm78/gmu.git
+GMU_LICENSE = GPL-2.1+
+GMU_LICENSE_FILES = LICENSE
+
+GMU_DEPENDENCIES = sdl
+
+define GMU_BUILD_CMDS
+	(cd $(@D); \
+	sed -i -e 's|rm -rf|#rm -rf|g' package; \
+	sed -i -e 's|make -f Makefile.funkey clean|#make -f Makefile.funkey clean|g' package; \
+	chmod +x package; \
+	./package \
+	)
+endef
+
+define GMU_INSTALL_TARGET_CMDS
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/bin/gmu/decoders
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/bin/gmu/frontends
+	$(INSTALL) -m 0755 $(@D)/opk/gmu $(TARGET_DIR)/usr/bin/gmu
+	$(INSTALL) -m 0755 $(@D)/opk/decoders/* $(TARGET_DIR)/usr/bin/gmu/decoders
+	$(INSTALL) -m 0755 $(@D)/opk/frontends/* $(TARGET_DIR)/usr/bin/gmu/frontends
+endef
+
+define GMU_CREATE_OPK
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/share/OPKs/Applications
+	$(HOST_DIR)/usr/bin/mksquashfs $(GMU_PKGDIR)/opk $(TARGET_DIR)/usr/local/share/OPKs/Applications/gmu_funkey-s.opk -all-root -noappend -no-exports -no-xattrs
+endef
+GMU_POST_INSTALL_TARGET_HOOKS += GMU_CREATE_OPK
+
+$(eval $(generic-package))

FunKey/package/gmu/opk/gmu.funkey-s.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=GMU
+Comment=A multi-format music player
+Exec=/usr/bin/gmu/gmu.dge
+Icon=gmu
+Categories=applications