Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-01-29 21:27:05 -04:00
22 changed files with 149 additions and 164 deletions
+2 -2
View File
@@ -147,7 +147,7 @@ private:
static const unsigned int MAX_BUFFERS = 8;
ALuint streamBuffers[MAX_BUFFERS];
Object::StrongRef<StaticDataBuffer> staticBuffer;
StrongRef<StaticDataBuffer> staticBuffer;
float pitch;
float volume;
@@ -176,7 +176,7 @@ private:
int sampleRate;
int channels;
Object::StrongRef<love::sound::Decoder> decoder;
StrongRef<love::sound::Decoder> decoder;
unsigned int toLoop;