mirror of
https://github.com/clockworkpi/launcher.git
synced 2025-12-14 10:48:51 +01:00
Merge pull request #20 from cuu/master
fix alsaaudio set_volume problem
This commit is contained in:
commit
858500a027
@ -79,16 +79,19 @@ class SoundPatch(AboveAllPatch):
|
||||
m = alsaaudio.Mixer()
|
||||
vol = m.getvolume()[0]
|
||||
|
||||
# print("VolumeUp vol %d " % vol)
|
||||
for i,v in enumerate(self.snd_segs):
|
||||
if vol >= v[0] and vol <= v[1]:
|
||||
self._Needle = i
|
||||
break
|
||||
|
||||
self._Needle += 1
|
||||
|
||||
if self._Needle > len(self.snd_segs) -1:
|
||||
self._Needle = len(self.snd_segs) -1
|
||||
|
||||
m.setvolume( self.snd_segs[self._Needle][1] ) ## prefer bigger one
|
||||
# print("Set volume %d" % self.snd_segs[self._Needle][1] )
|
||||
m.setvolume( self.snd_segs[self._Needle][0] + (self.snd_segs[self._Needle][1] - self.snd_segs[self._Needle][0])/2 ) ## prefer bigger one
|
||||
|
||||
self._Value = self.snd_segs[self._Needle][1]
|
||||
|
||||
|
||||
@ -202,7 +202,7 @@ def event_process(event,main_screen):
|
||||
exit()
|
||||
|
||||
if event.key == pygame.K_KP_PLUS:
|
||||
|
||||
if main_screen._CurrentPage._Name != "Sound volume": ## name from Menu/GameShell/10_Settings/Sound/pages.py
|
||||
main_screen.Draw()
|
||||
sound_patch.VolumeUp()
|
||||
sound_patch.Draw()
|
||||
@ -213,6 +213,7 @@ def event_process(event,main_screen):
|
||||
#main_screen.SwapAndShow()
|
||||
|
||||
if event.key == pygame.K_KP_MINUS:
|
||||
if main_screen._CurrentPage._Name != "Sound volume":
|
||||
main_screen.Draw()
|
||||
|
||||
sound_patch.VolumeDown()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user