Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-02 01:13:21 -04:00
35 changed files with 6573 additions and 7744 deletions
+9
View File
@@ -132,6 +132,15 @@ void Audio::setVelocity(float *)
{
}
void Audio::setDopplerScale(float)
{
}
float Audio::getDopplerScale() const
{
return 1.0f;
}
void Audio::record()
{
}
+3
View File
@@ -67,6 +67,9 @@ public:
void getVelocity(float *v) const;
void setVelocity(float *v);
void setDopplerScale(float scale);
float getDopplerScale() const;
void record();
love::sound::SoundData *getRecordedData();
love::sound::SoundData *stopRecording(bool returnData);