Sfoglia il codice sorgente

Merge pull request #77 from cuu/master

mpd title list bug,auto detect retroarch-local.cfg as RETRO_CONFIG
GNU 5 anni fa
parent
commit
2276f9c1b2

+ 5 - 1
Menu/GameShell/Music Player/play_list_page.py

@@ -97,7 +97,11 @@ class PlayListPage(Page):
             li._Fonts["normal"] = self._ListFont
 
             if "title" in v:
-                li.Init( v["title"])
+                if isinstance(v["title"], (list,)):
+                    li.Init(" | ".join(v["title"]))
+                else:
+                    li.Init( v["title"])
+                
                 if "file" in v:
                     li._Path = v["file"]
                 

+ 7 - 3
sys.py/UI/main_screen.py

@@ -454,14 +454,18 @@ class MainScreen(object):
                             with f:
                                 content = f.readlines()
                                 content = [x.strip() for x in content] 
-                        for i in content:
-                            pis = i.split("=")
+                        for c in content:
+                            pis = c.split("=")
                             if len(pis) > 1:
                                 if "EXT" in pis[0]:
                                     obj[pis[0]] = pis[1].split(",")
                                 else:
                                     obj[pis[0]] = pis[1]
-                        
+
+                        if FileExists(_dir+"/"+i+"/retroarch-local.cfg"):
+                            obj["RETRO_CONFIG"] = os.path.abspath( _dir+"/"+i+"/retroarch-local.cfg" )
+                            print("a local retroarch cfg:", obj["RETRO_CONFIG"])
+                            
                         em = MyEmulator()
                         em._Emulator = obj