Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-03-12 02:21:27 -03:00
124 changed files with 3248 additions and 1078 deletions
+2 -5
View File
@@ -61,12 +61,9 @@ int Audio::getMaxSources() const
return 0;
}
void Audio::play(love::audio::Source *)
{
}
void Audio::play()
bool Audio::play(love::audio::Source *)
{
return false;
}
void Audio::stop(love::audio::Source *)
+1 -2
View File
@@ -48,8 +48,7 @@ public:
love::audio::Source *newSource(love::sound::SoundData *soundData);
int getSourceCount() const;
int getMaxSources() const;
void play(love::audio::Source *source);
void play();
bool play(love::audio::Source *source);
void stop(love::audio::Source *source);
void stop();
void pause(love::audio::Source *source);
+2 -1
View File
@@ -42,8 +42,9 @@ love::audio::Source *Source::clone()
return this;
}
void Source::play()
bool Source::play()
{
return false;
}
void Source::stop()
+1 -1
View File
@@ -39,7 +39,7 @@ public:
virtual ~Source();
virtual love::audio::Source *clone();
virtual void play();
virtual bool play();
virtual void stop();
virtual void pause();
virtual void resume();