From 3128a127cf4e1eba541b2d816a3c924a77d5004d Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Sun, 27 Aug 2017 16:23:55 -0300
Subject: [PATCH] Rename love.audio.getSourceCount to getActiveSourceCount and
 deprecate the old function (resolves issue #1302).

--HG--
branch : minor
---
 src/modules/audio/Audio.h          |  2 +-
 src/modules/audio/null/Audio.cpp   |  2 +-
 src/modules/audio/null/Audio.h     |  2 +-
 src/modules/audio/openal/Audio.cpp |  4 ++--
 src/modules/audio/openal/Audio.h   |  2 +-
 src/modules/audio/openal/Pool.cpp  |  2 +-
 src/modules/audio/openal/Pool.h    |  2 +-
 src/modules/audio/wrap_Audio.cpp   | 16 +++++++++++++---
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h
index a20406d5f..25013fd76 100644
--- a/src/modules/audio/Audio.h
+++ b/src/modules/audio/Audio.h
@@ -83,7 +83,7 @@ public:
 	 * Gets the current number of simultaneous playing sources.
 	 * @return The current number of simultaneous playing sources.
 	 **/
-	virtual int getSourceCount() const = 0;
+	virtual int getActiveSourceCount() const = 0;
 
 	/**
 	 * Gets the maximum supported number of simultaneous playing sources.
diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp
index afa402cb9..c6f64e1e3 100644
--- a/src/modules/audio/null/Audio.cpp
+++ b/src/modules/audio/null/Audio.cpp
@@ -56,7 +56,7 @@ love::audio::Source *Audio::newSource(int, int, int, int)
 	return new Source();
 }
 
-int Audio::getSourceCount() const
+int Audio::getActiveSourceCount() const
 {
 	return 0;
 }
diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h
index 41c4da8f7..3ff47cbc2 100644
--- a/src/modules/audio/null/Audio.h
+++ b/src/modules/audio/null/Audio.h
@@ -48,7 +48,7 @@ public:
 	love::audio::Source *newSource(love::sound::Decoder *decoder);
 	love::audio::Source *newSource(love::sound::SoundData *soundData);
 	love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers);
-	int getSourceCount() const;
+	int getActiveSourceCount() const;
 	int getMaxSources() const;
 	bool play(love::audio::Source *source);
 	bool play(const std::vector<love::audio::Source*> &sources);
diff --git a/src/modules/audio/openal/Audio.cpp b/src/modules/audio/openal/Audio.cpp
index 08864c311..e90cb40ea 100644
--- a/src/modules/audio/openal/Audio.cpp
+++ b/src/modules/audio/openal/Audio.cpp
@@ -234,9 +234,9 @@ love::audio::Source *Audio::newSource(int sampleRate, int bitDepth, int channels
 	return new Source(pool, sampleRate, bitDepth, channels, buffers);
 }
 
-int Audio::getSourceCount() const
+int Audio::getActiveSourceCount() const
 {
-	return pool->getSourceCount();
+	return pool->getActiveSourceCount();
 }
 
 int Audio::getMaxSources() const
diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h
index 91299efc5..c8c8b4cb5 100644
--- a/src/modules/audio/openal/Audio.h
+++ b/src/modules/audio/openal/Audio.h
@@ -85,7 +85,7 @@ public:
 	love::audio::Source *newSource(love::sound::Decoder *decoder);
 	love::audio::Source *newSource(love::sound::SoundData *soundData);
 	love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers);
-	int getSourceCount() const;
+	int getActiveSourceCount() const;
 	int getMaxSources() const;
 	bool play(love::audio::Source *source);
 	bool play(const std::vector<love::audio::Source*> &sources);
diff --git a/src/modules/audio/openal/Pool.cpp b/src/modules/audio/openal/Pool.cpp
index 7607a6393..279be768d 100644
--- a/src/modules/audio/openal/Pool.cpp
+++ b/src/modules/audio/openal/Pool.cpp
@@ -115,7 +115,7 @@ void Pool::update()
 		releaseSource(s);
 }
 
-int Pool::getSourceCount() const
+int Pool::getActiveSourceCount() const
 {
 	return (int) playing.size();
 }
diff --git a/src/modules/audio/openal/Pool.h b/src/modules/audio/openal/Pool.h
index c90f978b2..c756160bc 100644
--- a/src/modules/audio/openal/Pool.h
+++ b/src/modules/audio/openal/Pool.h
@@ -80,7 +80,7 @@ public:
 
 	void update();
 
-	int getSourceCount() const;
+	int getActiveSourceCount() const;
 	int getMaxSources() const;
 
 private:
diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp
index 4b19cb0e9..48370466f 100644
--- a/src/modules/audio/wrap_Audio.cpp
+++ b/src/modules/audio/wrap_Audio.cpp
@@ -37,9 +37,9 @@ namespace audio
 
 #define instance() (Module::getInstance<Audio>(Module::M_AUDIO))
 
-int w_getSourceCount(lua_State *L)
+int w_getActiveSourceCount(lua_State *L)
 {
-	lua_pushinteger(L, instance()->getSourceCount());
+	lua_pushinteger(L, instance()->getActiveSourceCount());
 	return 1;
 }
 
@@ -524,10 +524,16 @@ int w_setMixWithSystem(lua_State *L)
 	return 1;
 }
 
+int w_getSourceCount(lua_State *L)
+{
+	luax_markdeprecated(L, "love.audio.getSourceCount", DEPRECATED_RENAMED, "love.audio.getActiveSourceCount");
+	return w_getActiveSourceCount(L);
+}
+
 // List of functions to wrap.
 static const luaL_Reg functions[] =
 {
-	{ "getSourceCount", w_getSourceCount },
+	{ "getActiveSourceCount", w_getActiveSourceCount },
 	{ "newSource", w_newSource },
 	{ "newQueueableSource", w_newQueueableSource },
 	{ "play", w_play },
@@ -555,6 +561,10 @@ static const luaL_Reg functions[] =
 	{ "getMaxSourceEffects", w_getMaxSourceEffects },
 	{ "isEffectsSupported", w_isEffectsSupported },
 	{ "setMixWithSystem", w_setMixWithSystem },
+
+	// Deprecated
+	{ "getSourceCount", w_getSourceCount },
+
 	{ 0, 0 }
 };