X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwaveform.cpp;h=57fc291eb4b10a47a2f9818358151a6cbefae0d2;hb=HEAD;hp=36978c6fc65c816423d86305a8a5d1ee6bb6feed;hpb=6cc0f1735a00e8f9eb80ff0c9468fb67205f6d20;p=libs%2Fal.git diff --git a/source/waveform.cpp b/source/waveform.cpp index 36978c6..57fc291 100644 --- a/source/waveform.cpp +++ b/source/waveform.cpp @@ -1,3 +1,4 @@ +#include #include "sounddecoder.h" #include "waveform.h" @@ -20,16 +21,14 @@ Waveform::~Waveform() void Waveform::load_file(const string &fn) { - SoundDecoder decoder; - decoder.open_file(fn); - load(decoder); + RefPtr decoder = SoundDecoder::open_file(fn); + load(*decoder); } -void Waveform::load_memory(const void *d, unsigned len) +void Waveform::load_io(IO::Seekable &io) { - SoundDecoder decoder; - decoder.open_memory(d, len); - load(decoder); + RefPtr decoder = SoundDecoder::open_io(io); + load(*decoder); } void Waveform::load(SoundDecoder &decoder)