diff --git a/Menu/GameShell/10_Settings/Sound/sound_page.py b/Menu/GameShell/10_Settings/Sound/sound_page.py index 52396b9..ce9c178 100644 --- a/Menu/GameShell/10_Settings/Sound/sound_page.py +++ b/Menu/GameShell/10_Settings/Sound/sound_page.py @@ -113,7 +113,6 @@ class SoundPage(Page): self._Height = self._Screen._Height self._MySlider = SoundSlider() - self._MySlider._Parent = self self._MySlider.SetCanvasHWND(self._CanvasHWND) @@ -123,19 +122,19 @@ class SoundPage(Page): self._MySlider.Init() try: - m = alsaaudio.Mixer() - self._MySlider.SetValue(m.getvolume()[0]) - except Exception,e: - print(str(e)) - self._MySlider.SetValue(0) + m = alsaaudio.Mixer() + self._MySlider.SetValue(m.getvolume()[0]) + except Exception,e: + print(str(e)) + self._MySlider.SetValue(0) def OnLoadCb(self): - try: + try: m = alsaaudio.Mixer() self._MySlider.SetValue(m.getvolume()[0]) - except Exception,e: - print(str(e)) + except Exception,e: + print(str(e)) def WhenSliderDrag(self,value): ##value 0-100 if value < 0 or value > 100: diff --git a/sys.py/run.py b/sys.py/run.py index b942e5f..7602224 100644 --- a/sys.py/run.py +++ b/sys.py/run.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +import platform import dbus import dbus.service import sys @@ -178,7 +178,6 @@ def RestoreLastBackLightBrightness(main_screen): f.truncate() f.close() - if main_screen._CounterScreen._Counting==True: main_screen._CounterScreen.StopCounter() main_screen.Draw() @@ -536,6 +535,27 @@ def big_loop(): gobject_loop() +def PreparationInAdv(): + + if "arm" not in platform.machine(): + return + + if FileExists(".powerlevel") == False: + os.system("touch .powerlevel") + + with open(".powerlevel","r") as f: + powerlevel = f.read() + + powerlevel = powerlevel.strip() + if powerlevel != "": + config.PowerLevel = powerlevel + if powerlevel != "supersaving": + os.system("sudo iw wlan0 set power_save off >/dev/null") + else: + os.system("sudo iw wlan0 set power_save on > /dev/null") + else: + os.system("sudo iw wlan0 set power_save off >/dev/null") + ###MAIN()### if __name__ == '__main__': @@ -568,22 +588,8 @@ if __name__ == '__main__': print("This pygame does not support PNG") exit() - - if FileExists(".powerlevel") == False: - os.system("touch .powerlevel") - with open(".powerlevel","r") as f: - powerlevel = f.read() - - powerlevel = powerlevel.strip() - if powerlevel != "": - config.PowerLevel = powerlevel - if powerlevel != "supersaving": - os.system("sudo iw wlan0 set power_save off >/dev/null") - else: - os.system("sudo iw wlan0 set power_save on > /dev/null") - else: - os.system("sudo iw wlan0 set power_save off >/dev/null") + PreparationInAdv() crt_screen = CreateByScreen() crt_screen.Init()