X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Foggdecoder.cpp;h=cd2def8ca78d1d86488d2ceb2d15a25ce9a916e7;hb=d365c5394308740f478fbdfbb23e2c5d972f19f0;hp=efea1f6200874542438e6187b50294437f395e42;hpb=d675d665b336507a795afaf67d18030b304b793d;p=libs%2Fal.git

diff --git a/source/oggdecoder.cpp b/source/oggdecoder.cpp
index efea1f6..cd2def8 100644
--- a/source/oggdecoder.cpp
+++ b/source/oggdecoder.cpp
@@ -89,15 +89,9 @@ OggDecoder::OggDecoder(IO::Seekable &io):
 
 	vorbis_info *info = ov_info(&priv->ovfile, -1);
 	freq = info->rate;
+	format = create_format(2, info->channels);
 
-	size = ov_pcm_total(&priv->ovfile, 0)*info->channels*2;
-
-	switch(info->channels)
-	{
-	case 1: format = MONO16; break;
-	case 2: format = STEREO16; break;
-	default: throw unsupported_sound(Msp::format("%d channels", info->channels));
-	}
+	size = ov_pcm_total(&priv->ovfile, 0)*get_unit_size(format);
 }
 
 OggDecoder::~OggDecoder()
@@ -107,9 +101,18 @@ OggDecoder::~OggDecoder()
 	delete priv;
 }
 
-void OggDecoder::rewind()
+bool OggDecoder::detect(const std::string &sig)
+{
+	static const char ogg_sig[] = { 'O', 'g', 'g', 'S' };
+	if(sig.size()<sizeof(ogg_sig))
+		return false;
+	return !sig.compare(0, sizeof(ogg_sig), ogg_sig);
+}
+
+void OggDecoder::seek(unsigned pos)
 {
-	ov_pcm_seek(&priv->ovfile, 0);
+	pos /= get_unit_size(format);
+	ov_pcm_seek(&priv->ovfile, pos);
 }
 
 unsigned OggDecoder::read(char *buf, unsigned len)