X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Foggdecoder.cpp;fp=source%2Foggdecoder.cpp;h=78a2b5ac158d20a857db455f7ee7e1e969b12922;hb=227da1e7a20432e056e7ab42444cb56f197c53d6;hp=d28734208d605e2c912444fe662fb3c72c6c5413;hpb=7961a6bc2a735d08a5d1ffeb6772ec3d545cb98c;p=libs%2Fal.git diff --git a/source/oggdecoder.cpp b/source/oggdecoder.cpp index d287342..78a2b5a 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()