Merge remote-tracking branch 'origin/master'

src/sound/OggStream.cpp

@@ -112,7 +112,7 @@ namespace oxygine
         release();
     }
 
-    bool OggStream::init(const void* data, unsigned int len)
+    bool OggStream::init(const void* data, size_t len)
     {
         release();
         _memStream.init(data, len);

src/sound/OggStream.h

@@ -16,7 +16,7 @@ namespace oxygine
         OggStream();
         ~OggStream();
 
-        bool init(const void* data, unsigned int len);
+        bool init(const void* data, size_t len) override;
         bool init(const char* path);
         bool init(file::handle h, bool close) override;
 
@@ -43,4 +43,4 @@ namespace oxygine
 
         int _section;
     };
-}
+}

src/sound/ResSound.cpp

@@ -118,7 +118,7 @@ namespace oxygine
 
     void ResSound::_load(LoadResourcesContext* context)
     {
-
+        _getSound();
     }
 
     void ResSound::_unload()

src/sound/SoundStream.h

@@ -9,7 +9,7 @@ namespace oxygine
         virtual ~SoundStream() {}
 
         virtual bool init(file::handle, bool close) = 0;
-        virtual bool init(const void* data, unsigned int len) = 0;
+        virtual bool init(const void* data, size_t len) = 0;
 
         virtual int decodeNextBlock(bool looped, void* data, int bufferSize) = 0;
         virtual void decodeAll(void* data, int bufferSize) = 0;
@@ -32,4 +32,4 @@ namespace oxygine
         int _pcm;
         bool _ended;
     };
-}
+}

src/sound/WavStream.h

@@ -13,7 +13,7 @@ namespace oxygine
 
         bool init(file::handle fh, bool close) override;
         void init(const char* name);
-        bool init(const void* data, size_t size);
+        bool init(const void* data, size_t size) override;
 
         int  decodeNextBlock(bool looped, void* data, int bufferSize) override;
         void decodeAll(void* data, int bufferSize) override;
@@ -32,4 +32,4 @@ namespace oxygine
         int _dataPos;
         bool _close;
     };
-}
+}