Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-07 18:10:19 -03:00
52 changed files with 861 additions and 579 deletions
+2 -2
View File
@@ -147,7 +147,7 @@ private:
static const unsigned int MAX_BUFFERS = 32;
ALuint streamBuffers[MAX_BUFFERS];
StaticDataBuffer *staticBuffer;
Object::StrongRef<StaticDataBuffer> staticBuffer;
float pitch;
float volume;
@@ -181,7 +181,7 @@ private:
int channels;
love::sound::Decoder *decoder;
Object::StrongRef<love::sound::Decoder> decoder;
unsigned int toLoop;