mirror of
https://github.com/clockworkpi/launcher.git
synced 2025-12-12 17:58:50 +01:00
Merge pull request #28 from cuu/master
add RETRO_CONFIG field in action.config to allow to specify the confi…
This commit is contained in:
commit
83862dcd84
@ -3,4 +3,5 @@ ROM_SO=/home/cpi/apps/emulators/mame2003_plus_libretro.so
|
|||||||
EXT=zip
|
EXT=zip
|
||||||
LAUNCHER=retroarch -L
|
LAUNCHER=retroarch -L
|
||||||
TITLE=MAME Roms
|
TITLE=MAME Roms
|
||||||
SO_URL=http://buildbot.libretro.com/nightly/linux/armhf/latest/mame2003_plus_libretro.so.zip
|
SO_URL=http://buildbot.libretro.com/nightly/linux/armhf/latest/mame2003_plus_libretro.so.zip
|
||||||
|
RETRO_CONFIG=/home/cpi/apps/configs/mame.config
|
||||||
|
|||||||
@ -312,7 +312,13 @@ class FavListPage(Page):
|
|||||||
# check ROM_SO exists
|
# check ROM_SO exists
|
||||||
if FileExists(self._Emulator["ROM_SO"]):
|
if FileExists(self._Emulator["ROM_SO"]):
|
||||||
escaped_path = CmdClean( cur_li._Path)
|
escaped_path = CmdClean( cur_li._Path)
|
||||||
cmdpath = " ".join( (self._Emulator["LAUNCHER"],self._Emulator["ROM_SO"], escaped_path))
|
|
||||||
|
custom_config = ""
|
||||||
|
if self._Emulator["RETRO_CONFIG"] != "" and len(self._Emulator["RETRO_CONFIG"]) > 5:
|
||||||
|
custom_config = " -c " + self._Emulator["RETRO_CONFIG"]
|
||||||
|
|
||||||
|
cmdpath = " ".join( (self._Emulator["LAUNCHER"],self._Emulator["ROM_SO"], custom_config, escaped_path))
|
||||||
|
|
||||||
pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath))
|
pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath))
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
|
|||||||
@ -341,7 +341,12 @@ class RomListPage(Page):
|
|||||||
# check ROM_SO exists
|
# check ROM_SO exists
|
||||||
if FileExists(self._Emulator["ROM_SO"]):
|
if FileExists(self._Emulator["ROM_SO"]):
|
||||||
escaped_path = CmdClean( cur_li._Path)
|
escaped_path = CmdClean( cur_li._Path)
|
||||||
cmdpath = " ".join( (self._Emulator["LAUNCHER"],self._Emulator["ROM_SO"], escaped_path))
|
|
||||||
|
custom_config = ""
|
||||||
|
if self._Emulator["RETRO_CONFIG"] != "" and len(self._Emulator["RETRO_CONFIG"]) > 5:
|
||||||
|
custom_config = " -c " + self._Emulator["RETRO_CONFIG"]
|
||||||
|
|
||||||
|
cmdpath = " ".join( (self._Emulator["LAUNCHER"],self._Emulator["ROM_SO"], custom_config, escaped_path))
|
||||||
pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath))
|
pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath))
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
|
|||||||
@ -409,7 +409,7 @@ class MainScreen(object):
|
|||||||
obj["LAUNCHER"] = ""
|
obj["LAUNCHER"] = ""
|
||||||
obj["TITLE"] = "Game"
|
obj["TITLE"] = "Game"
|
||||||
obj["SO_URL"] = ""
|
obj["SO_URL"] = ""
|
||||||
|
obj["RETRO_CONFIG"] = "" ##
|
||||||
try:
|
try:
|
||||||
f = open(_dir+"/"+i+"/"+emulator_flag)
|
f = open(_dir+"/"+i+"/"+emulator_flag)
|
||||||
except IOError:
|
except IOError:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user