X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Foggdecoder.cpp;h=374cf0b5ba06966174270a96c1d193a511843bcb;hb=1e7141871d33e3e184456ba063fcf3448a8cc12a;hp=d28734208d605e2c912444fe662fb3c72c6c5413;hpb=d035e638b940f25cb5d46a049a00b34dc60dc5e0;p=libs%2Fal.git

diff --git a/source/oggdecoder.cpp b/source/oggdecoder.cpp
index d287342..374cf0b 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()
@@ -112,12 +106,13 @@ 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);
+	return !sig.compare(0, sizeof(ogg_sig), ogg_sig, sizeof(ogg_sig));
 }
 
-void OggDecoder::rewind()
+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)