From 0da1142bdbf72d4d6bf46fce6f258f88a2cfe449 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Tue, 17 Jan 2017 16:11:49 +0100 Subject: [PATCH] - Run libsndfile before libmpg123 when reading an audio lump. libmpg123 spews quite a lot of debug stuff in stdout when encountering files like WAV or Ogg Vorbis, while libsndfile is silent when encountering an MP3 file. --- src/sound/i_sound.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp index 67f46b266..d7788ae7a 100644 --- a/src/sound/i_sound.cpp +++ b/src/sound/i_sound.cpp @@ -615,8 +615,8 @@ SoundDecoder *SoundRenderer::CreateDecoder(FileReader *reader) SoundDecoder *decoder = NULL; int pos = reader->Tell(); -#ifdef HAVE_MPG123 - decoder = new MPG123Decoder; +#ifdef HAVE_SNDFILE + decoder = new SndFileDecoder; if (decoder->open(reader)) return decoder; reader->Seek(pos, SEEK_SET); @@ -624,8 +624,8 @@ SoundDecoder *SoundRenderer::CreateDecoder(FileReader *reader) delete decoder; decoder = NULL; #endif -#ifdef HAVE_SNDFILE - decoder = new SndFileDecoder; +#ifdef HAVE_MPG123 + decoder = new MPG123Decoder; if (decoder->open(reader)) return decoder; reader->Seek(pos, SEEK_SET);