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

diff --git a/source/sounddecoder.cpp b/source/sounddecoder.cpp
index 138117f..ed9de80 100644
--- a/source/sounddecoder.cpp
+++ b/source/sounddecoder.cpp
@@ -1,6 +1,12 @@
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
-#include "oggdecoder.h"
+#include <msp/strings/format.h>
+#ifdef WITH_LIBMAD
+#include "mad/mp3decoder.h"
+#endif
+#ifdef WITH_LIBVORBIS
+#include "vorbis/oggdecoder.h"
+#endif
 #include "sounddecoder.h"
 
 using namespace std;
@@ -29,14 +35,36 @@ SoundDecoder::~SoundDecoder()
 SoundDecoder *SoundDecoder::open_file(const string &fn)
 {
 	RefPtr<IO::BufferedFile> file = new IO::BufferedFile(fn);
-	SoundDecoder *decoder = new OggDecoder(*file);
+	SoundDecoder *decoder = open_io(*file);
 	decoder->source = file.release();
 	return decoder;
 }
 
 SoundDecoder *SoundDecoder::open_io(IO::Seekable &io)
 {
-	return new OggDecoder(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);
+#endif
+
+#ifdef WITH_LIBMAD
+	if(Mp3Decoder::detect(signature))
+		return new Mp3Decoder(io);
+#endif
+
+	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);
 }
 
 } // namespace AL