From f36e4545641f2865ff261f27b046d828dcf01beb Mon Sep 17 00:00:00 2001 From: John Stumpo Date: Sat, 10 Jul 2010 18:52:44 -0400 Subject: [PATCH] Require either OggStreamer or pyogg/pyvorbis - never fall back on just running one track in the SDL_mixer music channel. --- src/Audio.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Audio.py b/src/Audio.py index 988cec795..c3ccdb822 100644 --- a/src/Audio.py +++ b/src/Audio.py @@ -45,17 +45,13 @@ __import__('pygame.mixer_music') pygame.mixer.music = sys.modules['pygame.mixer_music'] -ogg = None OggStreamer = None try: import OggStreamer Log.debug('Using new OggStreamer module for ogg streaming.') except ImportError: Log.warn('OggStreamer not found. Falling back to legacy pyogg/pyvorbis based ogg streamer.') - try: - import ogg.vorbis - except ImportError: - Log.warn("PyOGG not found. OGG files will be fully decoded prior to playing; expect absurd memory usage.") + import ogg.vorbis class Audio: def pre_open(self, frequency = 22050, bits = 16, stereo = True, bufferSize = 1024): @@ -276,7 +272,7 @@ def run(self, ticks): self.channel.queue(snd) self.channel.set_volume(self.volume) -if OggStreamer is None and ogg is not None: +if OggStreamer is None: class OggStream(object): def __init__(self, inputFileName): self.file = ogg.vorbis.VorbisFile(inputFileName)