anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

tentative fix for issue#229

Browse source 
See: https://github.com/shlomif/PySolFC/issues/229

pygame2 compat.
This commit is contained in:
Shlomi Fish 2021-11-28 08:46:48 +02:00 • committed by Joe R
parent c867eda28e
commit 5c32bd3978
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pysollib/app.py
View file

@ -1252,9 +1252,9 @@ class Application:
self.initResource(manager, dirs, ext_re, Sample) self.initResource(manager, dirs, ext_re, Sample)
def initMusic(self): def initMusic(self):
manager = self.music_manager music_manager = self.music_manager
# find all available music songs # find all available music songs
dirs = manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC") dirs = music_manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC")
# print dirs # print('dirs =', dirs)
ext_re = re.compile(self.audio.EXTENSIONS) ext_re = re.compile(self.audio.EXTENSIONS)
self.initResource(manager, dirs, ext_re, Music) self.initResource(music_manager, dirs, ext_re, Music)

12
pysollib/pysolaudio.py
View file

@ -502,6 +502,7 @@ class PyGameAudioClient(AbstractAudioClient):
def __init__(self): def __init__(self):
AbstractAudioClient.__init__(self) AbstractAudioClient.__init__(self)
import pygame.mixer import pygame.mixer
import pygame.mixer_music
import pygame.time import pygame.time
if os.name == 'nt': if os.name == 'nt':
# for py2exe # for py2exe
@ -510,7 +511,8 @@ class PyGameAudioClient(AbstractAudioClient):
import pygame.mixer_music import pygame.mixer_music
self.mixer = pygame.mixer self.mixer = pygame.mixer
self.time = pygame.time self.time = pygame.time
self.music = self.mixer.music self.mixer_music = pygame.mixer_music
self.music = self.mixer_music
self.audiodev = self.mixer self.audiodev = self.mixer
self.sound = None self.sound = None
self.sound_channel = None self.sound_channel = None
@ -561,7 +563,7 @@ class PyGameAudioClient(AbstractAudioClient):
self.sound_channel = None self.sound_channel = None
def _playMusicLoop(self): def _playMusicLoop(self):
# print '_playMusicLoop' # print('_playMusicLoop')
music_list = self.music_list music_list = self.music_list
if not music_list: if not music_list:
return return
@ -604,14 +606,14 @@ class PyGameAudioClient(AbstractAudioClient):
th.start() th.start()
def updateSettings(self): def updateSettings(self):
if (not self.app.opt.sound or not self.app.opt.music or if (not ((self.app.opt.sound or self.app.opt.music) and
self.app.opt.sound_music_volume == 0): self.app.opt.sound_music_volume > 0)):
if self.music: if self.music:
self.music.stop() self.music.stop()
self.music = None self.music = None
else: else:
if not self.music: if not self.music:
self.music = self.mixer.music self.music = self.mixer_music
th = Thread(target=self._playMusicLoop) th = Thread(target=self._playMusicLoop)
th.start() th.start()
else: else: