Rename Source/SoundData/Decoder:getChannels to getChannelCount (resolves issue #1307). Deprecate the old methods rather than completely removing them.

--HG--
branch : minor

src/modules/sound/lullaby/CoreAudioDecoder.cpp

@@ -258,7 +258,7 @@ bool CoreAudioDecoder::isSeekable()
 	return true;
 }
 
-int CoreAudioDecoder::getChannels() const
+int CoreAudioDecoder::getChannelCount() const
 {
 	return outputInfo.mChannelsPerFrame;
 }

src/modules/sound/lullaby/CoreAudioDecoder.h

@@ -57,7 +57,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	double getDuration();
 

src/modules/sound/lullaby/FLACDecoder.cpp

@@ -41,7 +41,7 @@ FLACDecoder::FLACDecoder(Data *data, const std::string &ext, int nbufferSize)
 	process_until_end_of_metadata();
 	process_single();
 	seek(0);
-	bufferSize = 256 * getBitDepth() * getChannels() * 2;
+	bufferSize = 256 * getBitDepth() * getChannelCount() * 2;
 	delete[](char *) buffer;
 	buffer = new char[bufferSize];
 }
@@ -93,7 +93,7 @@ bool FLACDecoder::isSeekable()
 	return true;
 }
 
-int FLACDecoder::getChannels() const
+int FLACDecoder::getChannelCount() const
 {
 	return get_channels();
 }

src/modules/sound/lullaby/FLACDecoder.h

@@ -49,7 +49,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	int getSampleRate() const;
 	double getDuration();

src/modules/sound/lullaby/GmeDecoder.cpp

@@ -132,7 +132,7 @@ bool GmeDecoder::isSeekable()
 	return true;
 }
 
-int GmeDecoder::getChannels() const
+int GmeDecoder::getChannelCount() const
 {
 	return 2;
 }

src/modules/sound/lullaby/GmeDecoder.h

@@ -54,7 +54,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	double getDuration();
 

src/modules/sound/lullaby/ModPlugDecoder.cpp

@@ -132,7 +132,7 @@ bool ModPlugDecoder::isSeekable()
 	return true;
 }
 
-int ModPlugDecoder::getChannels() const
+int ModPlugDecoder::getChannelCount() const
 {
 	return 2;
 }

src/modules/sound/lullaby/ModPlugDecoder.h

@@ -57,7 +57,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	double getDuration();
 

src/modules/sound/lullaby/Mpg123Decoder.cpp

@@ -257,7 +257,7 @@ bool Mpg123Decoder::isSeekable()
 	return true;
 }
 
-int Mpg123Decoder::getChannels() const
+int Mpg123Decoder::getChannelCount() const
 {
 	return channels;
 }

src/modules/sound/lullaby/Mpg123Decoder.h

@@ -69,7 +69,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	double getDuration();
 

src/modules/sound/lullaby/VorbisDecoder.cpp

@@ -250,7 +250,7 @@ bool VorbisDecoder::isSeekable()
 	return (result != 0);
 }
 
-int VorbisDecoder::getChannels() const
+int VorbisDecoder::getChannelCount() const
 {
 	return vorbisInfo->channels;
 }

src/modules/sound/lullaby/VorbisDecoder.h

@@ -60,7 +60,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	int getSampleRate() const;
 	double getDuration();

src/modules/sound/lullaby/WaveDecoder.cpp

@@ -174,7 +174,7 @@ bool WaveDecoder::isSeekable()
 	return true;
 }
 
-int WaveDecoder::getChannels() const
+int WaveDecoder::getChannelCount() const
 {
 	return info.channels;
 }

src/modules/sound/lullaby/WaveDecoder.h

@@ -56,7 +56,7 @@ public:
 	bool seek(float s);
 	bool rewind();
 	bool isSeekable();
-	int getChannels() const;
+	int getChannelCount() const;
 	int getBitDepth() const;
 	int getSampleRate() const;
 	double getDuration();