X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsounddecoder.cpp;h=ed9de800ffef84345faf133260080a9aa9eb6b96;hb=8e12e7c9f65632342a8f370ea2de6b029cb564ec;hp=38ae8fa15b77635e360ee50d313345eee6edb37b;hpb=0e266d73f9aab89410c736e969eaa51ef914acf1;p=libs%2Fal.git

diff --git a/source/sounddecoder.cpp b/source/sounddecoder.cpp
index 38ae8fa..ed9de80 100644
--- a/source/sounddecoder.cpp
+++ b/source/sounddecoder.cpp
@@ -1,8 +1,12 @@
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
-#include "mp3decoder.h"
-#include "oggdecoder.h"
+#ifdef WITH_LIBMAD
+#include "mad/mp3decoder.h"
+#endif
+#ifdef WITH_LIBVORBIS
+#include "vorbis/oggdecoder.h"
+#endif
 #include "sounddecoder.h"
 
 using namespace std;
@@ -40,22 +44,27 @@ SoundDecoder *SoundDecoder::open_io(IO::Seekable &io)
 {
 	char sig_buf[8];
 	io.read(sig_buf, sizeof(sig_buf));
+	io.seek(0, IO::S_BEG);
 	string signature(sig_buf, sizeof(sig_buf));
+
+#ifdef WITH_LIBVORBIS
 	if(OggDecoder::detect(signature))
 		return new OggDecoder(io);
-	else if(Mp3Decoder::detect(signature))
+#endif
+
+#ifdef WITH_LIBMAD
+	if(Mp3Decoder::detect(signature))
 		return new Mp3Decoder(io);
-	else
+#endif
+
+	string sig_hex;
+	for(unsigned i=0; i<sizeof(sig_buf); ++i)
 	{
-		string sig_hex;
-		for(unsigned i=0; i<sizeof(sig_buf); ++i)
-		{
-			if(i)
-				sig_hex += ' ';
-			sig_hex += Msp::format("%02X", static_cast<unsigned char>(sig_buf[i]));
-		}
-		throw unsupported_sound(sig_hex);
+		if(i)
+			sig_hex += ' ';
+		sig_hex += Msp::format("%02X", static_cast<unsigned char>(sig_buf[i]));
 	}
+	throw unsupported_sound(sig_hex);
 }
 
 } // namespace AL