Use Msp::IO in SoundDecoder

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 5aef1b4555081963d12da637ee5dfd199a75718a..8e53964f930b783d52daaed06df09b91dcdc2eaf 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,3 +1,4 @@
+#include <msp/io/memory.h>
 #include "buffer.h"
 #include "waveform.h"
 
@@ -44,7 +45,8 @@ Buffer::Loader::Loader(Buffer &b):
 void Buffer::Loader::sound_data(const string &data)
 {
        Waveform wave;
-       wave.load_memory(data.data(), data.size());
+       IO::Memory mem(data.data(), data.size());
+       wave.load_io(mem);
 
        buf.data(wave);
 }

diff --git a/source/sounddecoder.cpp b/source/sounddecoder.cpp
index d4d176718d9dbc1b82cb402781df8371719f593d..c9da9b808e75b87b540179e4932907fbd92b6858 100644 (file)
--- a/source/sounddecoder.cpp
+++ b/source/sounddecoder.cpp
@@ -1,62 +1,47 @@
 #include <cstring>
 #include <stdexcept>
+#include <msp/io/file.h>
+#include <msp/io/memory.h>
 #include "sounddecoder.h"
 
 using namespace std;
 
 namespace {
 
-struct MemorySource
+size_t read(void *ptr, size_t size, size_t nmemb, void *src)
 {
-       const void *data;
-       unsigned length;
-       unsigned pos;
-
-       MemorySource(const void *d, unsigned l): data(d), length(l), pos(0) { }
-};
-
-size_t memory_read(void *ptr, size_t size, size_t nmemb, void *src)
-{
-       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
-       unsigned len = min<unsigned>(size*nmemb, memsrc.length-memsrc.pos);
-       memcpy(ptr, reinterpret_cast<const char *>(memsrc.data)+memsrc.pos, len);
-       memsrc.pos += len;
-
+       Msp::IO::Base *in = reinterpret_cast<Msp::IO::Base *>(src);
+       unsigned len = in->read(reinterpret_cast<char *>(ptr), size*nmemb);
        return len/size;
 }
 
-int memory_seek(void *src, ogg_int64_t offset, int whence)
+int seek(void *src, ogg_int64_t offset, int whence)
 {
-       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
+       Msp::IO::SeekType type;
        if(whence==SEEK_SET)
-               memsrc.pos = offset;
+               type = Msp::IO::S_BEG;
        else if(whence==SEEK_CUR)
-               memsrc.pos += offset;
+               type = Msp::IO::S_CUR;
        else if(whence==SEEK_END)
-               memsrc.pos = memsrc.length-offset;
-       memsrc.pos = min(memsrc.pos, memsrc.length);
-
-       return memsrc.pos;
-}
+               type = Msp::IO::S_END;
+       else
+               return -1;
 
-int memory_close(void *src)
-{
-       delete reinterpret_cast<MemorySource *>(src);
-       return 0;
+       Msp::IO::Seekable *in = reinterpret_cast<Msp::IO::Seekable *>(src);
+       return in->seek(offset, type);
 }
 
-long memory_tell(void *src)
+long tell(void *src)
 {
-       MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
-       return memsrc.pos;
+       return reinterpret_cast<Msp::IO::Seekable *>(src)->tell();
 }
 
-ov_callbacks memory_callbacks=
+ov_callbacks io_callbacks =
 {
-       &memory_read,
-       &memory_seek,
-       &memory_close,
-       &memory_tell
+       &read,
+       &seek,
+       0,
+       &tell
 };
 
 } // namespace
@@ -65,6 +50,7 @@ namespace Msp {
 namespace AL {
 
 SoundDecoder::SoundDecoder():
+       source(0),
        eof_flag(false)
 {
        ovfile.datasource = 0;
@@ -72,31 +58,32 @@ SoundDecoder::SoundDecoder():
 
 SoundDecoder::~SoundDecoder()
 {
-       if(ovfile.datasource)
-               ov_clear(&ovfile);
+       close();
 }
 
 void SoundDecoder::open_file(const string &fn)
 {
        if(ovfile.datasource)
                throw logic_error("Sound has already been opened");
-       if(ov_fopen(const_cast<char *>(fn.c_str()), &ovfile)<0)
+
+       IO::BufferedFile *file = new IO::BufferedFile(fn);
+       if(ov_open_callbacks(file, &ovfile, 0, 0, io_callbacks)<0)
+       {
+               delete file;
                throw runtime_error("Could not open ogg vorbis file "+fn);
+       }
+       source = file;
 
        open_common();
 }
 
-void SoundDecoder::open_memory(const void *d, unsigned len)
+void SoundDecoder::open_io(Msp::IO::Seekable &io)
 {
        if(ovfile.datasource)
                throw logic_error("Sound has already been opened");
 
-       MemorySource *src = new MemorySource(d, len);
-       if(ov_open_callbacks(src, &ovfile, 0, 0, memory_callbacks)<0)
-       {
-               delete src;
-               throw runtime_error("Could not open ogg vorbis memory block");
-       }
+       if(ov_open_callbacks(&io, &ovfile, 0, 0, io_callbacks)<0)
+               throw runtime_error("Could not open ogg vorbis resource");
 
        open_common();
 }
@@ -120,6 +107,8 @@ void SoundDecoder::close()
 {
        if(ovfile.datasource)
                ov_clear(&ovfile);
+       delete source;
+       source = 0;
 }
 
 void SoundDecoder::rewind()

diff --git a/source/sounddecoder.h b/source/sounddecoder.h
index ad56646b30dc149c9bfe48ef3fb243f3d811121f..c9566592f38870198e84bc8a263cf65d5b177522 100644 (file)
--- a/source/sounddecoder.h
+++ b/source/sounddecoder.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vorbis/vorbisfile.h>
+#include <msp/io/seekable.h>
 #include "format.h"
 
 namespace Msp {
@@ -16,6 +17,7 @@ class SoundDecoder
 {
 private:
        OggVorbis_File ovfile;
+       IO::Seekable *source;
        unsigned freq;
        unsigned size;
        Format format;
@@ -26,7 +28,7 @@ public:
        ~SoundDecoder();
 
        void open_file(const std::string &);
-       void open_memory(const void *, unsigned);
+       void open_io(IO::Seekable &);
 private:
        void open_common();
 public:

diff --git a/source/waveform.cpp b/source/waveform.cpp
index 36978c6fc65c816423d86305a8a5d1ee6bb6feed..de195f7671ab00e8a95dda3539318e5aeae11f09 100644 (file)
--- a/source/waveform.cpp
+++ b/source/waveform.cpp
@@ -25,10 +25,10 @@ void Waveform::load_file(const string &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);
+       decoder.open_io(io);
        load(decoder);
 }
 

diff --git a/source/waveform.h b/source/waveform.h
index c1f0a2d7ff3421b9409bb15974ef5173bd5494e1..db0d61ddfca638bb1e38326fa4ee73d99a6d03be 100644 (file)
--- a/source/waveform.h
+++ b/source/waveform.h
@@ -2,6 +2,7 @@
 #define MSP_AL_WAVEFORM_H_
 
 #include <string>
+#include <msp/io/seekable.h>
 #include "format.h"
 
 namespace Msp {
@@ -22,7 +23,7 @@ public:
        ~Waveform();
 
        void load_file(const std::string &);
-       void load_memory(const void *, unsigned);
+       void load_io(IO::Seekable &);
        void load(SoundDecoder &);
 
        Format get_format() const { return format; }