Browse Source

USe audio library from synergine

Bastien Sevajol 7 years ago
parent
commit
c67d7a7365
1 changed files with 3 additions and 16 deletions
  1. 3 16
      opencombat/gui/base.py

+ 3 - 16
opencombat/gui/base.py View File

12
 from pyglet.window import key
12
 from pyglet.window import key
13
 
13
 
14
 from cocos.actions import MoveTo as BaseMoveTo
14
 from cocos.actions import MoveTo as BaseMoveTo
15
-from cocos.audio.pygame.mixer import Sound
15
+from synergine2_cocos2d.audio import AudioLibrary as BaseAudioLibrary
16
 from synergine2_cocos2d.interaction import InteractionManager
16
 from synergine2_cocos2d.interaction import InteractionManager
17
 from synergine2_cocos2d.middleware import MapMiddleware
17
 from synergine2_cocos2d.middleware import MapMiddleware
18
 from synergine2_cocos2d.util import PathManager
18
 from synergine2_cocos2d.util import PathManager
165
         )
165
         )
166
 
166
 
167
 
167
 
168
-# TODO: Move into synergine2cocos2d
169
-class AudioLibrary(object):
168
+class AudioLibrary(BaseAudioLibrary):
170
     sound_file_paths = {
169
     sound_file_paths = {
171
         'gunshot_default': '204010__duckduckpony__homemade-gunshot-2.ogg',
170
         'gunshot_default': '204010__duckduckpony__homemade-gunshot-2.ogg',
172
     }
171
     }
173
 
172
 
174
-    def __init__(self, config: Config) -> None:
175
-        self.config = config
176
-        self._path_manager = PathManager(config.resolve('global.include_path.sounds'))
177
-        self._sounds = {}
178
-
179
-    def get_sound(self, name: str) -> Sound:
180
-        if name not in self._sounds:
181
-            sound_file_name = self.sound_file_paths[name]
182
-            sound_file_path = self._path_manager.path(sound_file_name)
183
-            self._sounds[name] = Sound(sound_file_path)
184
-        return self._sounds[name]
185
-
186
 
173
 
187
 class Game(TMXGui):
174
 class Game(TMXGui):
188
     layer_manager_class = TileLayerManager
175
     layer_manager_class = TileLayerManager
202
             read_queue_interval=read_queue_interval,
189
             read_queue_interval=read_queue_interval,
203
             map_dir_path=map_dir_path,
190
             map_dir_path=map_dir_path,
204
         )
191
         )
205
-        self.sound_lib = AudioLibrary(self.config)
192
+        self.sound_lib = AudioLibrary(config.resolve('global.include_path.sounds'))
206
         self.graphic_path_manager = PathManager(self.config.resolve(
193
         self.graphic_path_manager = PathManager(self.config.resolve(
207
             'global.include_path.graphics',
194
             'global.include_path.graphics',
208
         ))
195
         ))