X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsound.cpp;h=fe2de5eb5c4b85faa6c05c25e64a0d30d44f775d;hb=17948408eafd48ea529acd0a70cc45fc5973cb10;hp=c4a00efdedec278fa91c931b08e4054b12a487fe;hpb=effcac6ee0bc2297eed8f00e0b04f78064090dd6;p=libs%2Fal.git diff --git a/source/sound.cpp b/source/sound.cpp index c4a00ef..fe2de5e 100644 --- a/source/sound.cpp +++ b/source/sound.cpp @@ -103,6 +103,21 @@ void Sound::open_memory(const void *d, unsigned len) open_common(); } +void Sound::open_common() +{ + delete data; + data = 0; + + vorbis_info *info = ov_info(&ovfile, -1); + freq = info->rate; + switch(info->channels) + { + case 1: format = MONO16; break; + case 2: format = STEREO16; break; + default: throw runtime_error("Unsupported number of channels"); + } +} + void Sound::load_data() { if(data) @@ -176,20 +191,5 @@ const char *Sound::get_data() const return data; } -void Sound::open_common() -{ - delete data; - data = 0; - - vorbis_info *info = ov_info(&ovfile, -1); - freq = info->rate; - switch(info->channels) - { - case 1: format = MONO16; break; - case 2: format = STEREO16; break; - default: throw runtime_error("Unsupported number of channels"); - } -} - } // namespace AL } // namespace Msp