storm/pygstormgames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on getting the menu music to actually loop. Menu music is no longer tied to ogg specifically.

Browse Source
This commit is contained in:
Storm Dragon 2025-03-12 09:22:38 -04:00
parent 4aa3475ac4
commit 8264db4a2f
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu.py
View File

@ -26,7 +26,7 @@ class Menu:
try: try:
if self.game.sound.currentBgm: if self.game.sound.currentBgm:
self.game.sound.currentBgm.pause() self.game.sound.currentBgm.pause()
self.game.sound.play_bgm("sounds/music_menu.ogg") self.game.sound.play_bgm("music_menu")
except: except:
pass pass

53
sound.py
View File

@ -125,25 +125,54 @@ class Sound:
return filtered_sounds return filtered_sounds
def play_bgm(self, music_file): def play_bgm(self, music_name):
"""Play background music with proper volume. """Play background music with proper volume and looping.
Args: Args:
music_file (str): Path to music file music_name (str): Name of the music file in the sounds directory
Can be just the name (e.g., "music_menu")
or include subdirectory (e.g., "music/title")
""" """
try: try:
# Clean up old player
if self.currentBgm: if self.currentBgm:
self.currentBgm.pause() self.currentBgm.pause()
self.currentBgm = None
# Load and play new music
music = pyglet.media.load(music_file, streaming=True) # Check if the music is in the loaded sounds library
player = pyglet.media.Player() if music_name in self.sounds:
player.queue(music) # Use the already loaded sound
player.loop = True music = self.sounds[music_name]
player.volume = self.bgmVolume * self.masterVolume music_file = None
player.play() else:
# Try to load with extensions if not found
for ext in ['.ogg', '.wav', '.opus']:
if music_name.endswith(ext):
music_file = f"sounds/{music_name}"
break
elif os.path.exists(f"sounds/{music_name}{ext}"):
music_file = f"sounds/{music_name}{ext}"
break
# If we didn't find a file, try the direct path
if not music_file:
music_file = f"sounds/{music_name}"
if not os.path.exists(music_file):
music_file += ".ogg" # Default to .ogg if no extension
# Load the music file
music = pyglet.media.load(music_file, streaming=True)
# Create and configure player
player = pyglet.media.Player()
player.volume = self.bgmVolume * self.masterVolume
player.queue(music)
player.play()
player.on_eos = lambda: (player.queue(music), player.play())
# Store reference
self.currentBgm = player self.currentBgm = player
except Exception as e: except Exception as e:
print(f"Error playing background music: {e}") print(f"Error playing background music: {e}")